[Pkg-samba-maint] r3178 - branches/samba/experimental/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat Dec 19 11:31:18 UTC 2009
Author: bubulle
Date: 2009-12-19 11:31:06 +0000 (Sat, 19 Dec 2009)
New Revision: 3178
Modified:
branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
branches/samba/experimental/debian/patches/VERSION.patch
branches/samba/experimental/debian/patches/autoconf.patch
branches/samba/experimental/debian/patches/codepages-location.patch
branches/samba/experimental/debian/patches/documentation.patch
branches/samba/experimental/debian/patches/fhs-filespaths.patch
branches/samba/experimental/debian/patches/fix-manpages-warnings.patch
branches/samba/experimental/debian/patches/installswat.sh.patch
branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
branches/samba/experimental/debian/patches/pam-examples.patch
branches/samba/experimental/debian/patches/smbclient-pager.patch
branches/samba/experimental/debian/patches/smbtar-bashism.patch
branches/samba/experimental/debian/patches/undefined-symbols.patch
branches/samba/experimental/debian/patches/usershare.patch
Log:
Refresh patches so that they apply with fuzz (autobuilders don't like
this)
Modified: branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/341934
Forwarded: not-needed
-Index: b/examples/LDAP/README
+Index: experimental/examples/LDAP/README
===================================================================
---- a/examples/LDAP/README 2009-11-08 15:54:27.000000000 +0100
-+++ b/examples/LDAP/README 2009-11-08 15:55:34.000000000 +0100
+--- experimental.orig/examples/LDAP/README
++++ experimental/examples/LDAP/README
@@ -69,6 +69,9 @@
The smbldap-tools package can be downloaded individually from
https://gna.org/projects/smbldap-tools/
Modified: branches/samba/experimental/debian/patches/VERSION.patch
===================================================================
--- branches/samba/experimental/debian/patches/VERSION.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/VERSION.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -2,10 +2,10 @@
Author: Eloy A. Paris <peloy at debian.org>
Forwarded: not-needed
-Index: b/source3/VERSION
+Index: experimental/source3/VERSION
===================================================================
---- a/source3/VERSION 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/VERSION 2009-11-08 15:55:35.000000000 +0100
+--- experimental.orig/source3/VERSION
++++ experimental/source3/VERSION
@@ -84,7 +84,7 @@
# SAMBA_VERSION_VENDOR_FUNCTION #
# #
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -25,23 +25,25 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: b/source3/configure
+Index: experimental/source3/configure
===================================================================
---- a/source3/configure 2009-11-08 15:54:25.000000000 +0100
-+++ b/source3/configure 2009-11-08 15:55:39.000000000 +0100
-@@ -1,20 +1,22 @@
+--- experimental.orig/source3/configure
++++ experimental/source3/configure
+@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Samba 3.
-+# Generated by GNU Autoconf 2.64 for Samba 3.
++# Generated by GNU Autoconf 2.65 for Samba 3.
#
# Report bugs to <samba-technical at samba.org>.
#
++#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+#
++#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
@@ -58,7 +60,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@
+@@ -22,23 +26,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -87,7 +89,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +40,13 @@
+@@ -46,7 +42,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
@@ -102,7 +104,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +57,7 @@
+@@ -57,7 +59,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -111,7 +113,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@
+@@ -80,13 +82,6 @@
}
fi
@@ -125,7 +127,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +89,15 @@
+@@ -96,15 +91,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -144,7 +146,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +109,16 @@
+@@ -116,12 +111,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -165,7 +167,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +130,300 @@
+@@ -133,330 +132,300 @@
LANGUAGE=C
export LANGUAGE
@@ -742,7 +744,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +440,7 @@
+@@ -473,8 +442,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -752,7 +754,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +450,18 @@
+@@ -484,29 +452,18 @@
exit
}
@@ -787,7 +789,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +491,7 @@
+@@ -536,7 +493,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -796,7 +798,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +510,10 @@
+@@ -555,10 +512,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -809,15 +811,18 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -572,7 +527,6 @@
+@@ -572,8 +529,8 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
- exec 7<&0 </dev/null 6>&1
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
# Name of the host.
-@@ -591,7 +545,6 @@
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -591,7 +548,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -825,7 +830,7 @@
# Identity of this package.
PACKAGE_NAME='Samba'
-@@ -599,6 +552,7 @@
+@@ -599,6 +555,7 @@
PACKAGE_VERSION='3'
PACKAGE_STRING='Samba 3'
PACKAGE_BUGREPORT='samba-technical at samba.org'
@@ -833,7 +838,7 @@
ac_unique_file="include/includes.h"
ac_default_prefix=/usr/local/samba
-@@ -945,6 +899,7 @@
+@@ -956,6 +913,7 @@
program_transform_name
prefix
exec_prefix
@@ -841,7 +846,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1164,8 +1119,7 @@
+@@ -1182,8 +1140,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 &&
@@ -851,7 +856,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1191,8 +1145,7 @@
+@@ -1209,8 +1166,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 &&
@@ -861,7 +866,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1396,8 +1349,7 @@
+@@ -1414,8 +1370,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 &&
@@ -871,7 +876,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1413,8 +1365,7 @@
+@@ -1431,8 +1386,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 &&
@@ -881,7 +886,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1444,17 +1395,17 @@
+@@ -1462,17 +1416,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -905,7 +910,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1471,15 +1422,13 @@
+@@ -1489,15 +1443,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -923,7 +928,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1502,8 +1451,7 @@
+@@ -1520,8 +1472,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -933,7 +938,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1533,11 +1481,9 @@
+@@ -1551,11 +1502,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -947,7 +952,7 @@
# Find the source files, if location was not specified.
-@@ -1576,13 +1522,11 @@
+@@ -1594,13 +1543,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -963,12 +968,21 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1904,181 +1848,866 @@
+@@ -1847,7 +1794,7 @@
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+@@ -1934,178 +1881,863 @@
if $ac_init_version; then
cat <<\_ACEOF
Samba configure 3
-generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1023,7 +1037,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
-_ACEOF
-exec 5>>config.log
@@ -1071,7 +1085,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
@@ -1226,7 +1240,7 @@
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
-## ----------- ##
-## Core tests. ##
@@ -1362,7 +1376,7 @@
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
- cat <<\_ASBOX
-## ---------------- ##
@@ -1413,9 +1427,6 @@
- do
- eval ac_val=\$$ac_var
- case $ac_val in
-- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-- esac
-- $as_echo "$ac_var='\''$ac_val'\''"
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -1644,7 +1655,7 @@
+
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
@@ -1815,7 +1826,7 @@
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by Samba $as_me 3, which was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ $ $0 $@
+
@@ -1973,13 +1984,10 @@
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
-+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
-@@ -2119,39 +2748,41 @@
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
+@@ -2149,39 +2781,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -2026,25 +2034,33 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2170,7 +2801,7 @@
+@@ -2199,8 +2833,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2181,7 +2812,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
+@@ -2208,10 +2842,10 @@
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2189,7 +2820,7 @@
+@@ -2219,7 +2853,7 @@
esac
fi
else
@@ -2053,7 +2069,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2204,11 +2835,11 @@
+@@ -2234,11 +2868,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -2067,7 +2083,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2218,17 +2849,17 @@
+@@ -2248,17 +2882,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
@@ -2089,7 +2105,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2240,43 +2871,20 @@
+@@ -2270,43 +2904,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2140,7 +2156,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2290,14 +2898,12 @@
+@@ -2320,14 +2931,12 @@
ac_config_headers="$ac_config_headers include/config.h"
@@ -2157,7 +2173,7 @@
$as_echo "$as_me: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&2;}
;;
esac
-@@ -2329,24 +2935,16 @@
+@@ -2359,24 +2968,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2190,7 +2206,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2358,57 +2956,29 @@
+@@ -2388,57 +2989,29 @@
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
@@ -2211,7 +2227,7 @@
-$as_echo "$as_me: error: cannot find libreplace in $libreplacepaths" >&2;}
- { (exit 1); exit 1; }; }
-fi
--LIBREPLACEOBJ="replace.o"
+-LIBREPLACEOBJ="$libreplacedir/replace.o"
-
-
# Make sure we can run config.sub.
@@ -2255,7 +2271,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -2424,28 +2994,24 @@
+@@ -2454,28 +3027,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2289,7 +2305,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -2461,28 +3027,24 @@
+@@ -2491,28 +3060,24 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -2323,7 +2339,7 @@
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
-@@ -2505,6 +3067,27 @@
+@@ -2535,6 +3100,27 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
@@ -2341,7 +2357,7 @@
+if test x"$libreplacedir" = "x"; then
+ as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
+fi
-+LIBREPLACEOBJ="replace.o"
++LIBREPLACEOBJ="$libreplacedir/replace.o"
+
+
+
@@ -2351,7 +2367,7 @@
echo "LIBREPLACE_LOCATION_CHECKS: END"
-@@ -2533,7 +3116,7 @@
+@@ -2563,7 +3149,7 @@
# Check whether --with-fhs was given.
@@ -2360,7 +2376,7 @@
withval=$with_fhs; case "$withval" in
yes)
lockdir="\${VARDIR}/lib/samba"
-@@ -2550,9 +3133,7 @@
+@@ -2580,9 +3166,7 @@
cachedir="\${VARDIR}/lib/samba"
ncalrpcdir="\${VARDIR}/ncalrpc"
@@ -2371,7 +2387,7 @@
;;
esac
-@@ -2563,13 +3144,13 @@
+@@ -2593,13 +3177,13 @@
# set private directory location
# Check whether --with-privatedir was given.
@@ -2387,7 +2403,7 @@
$as_echo "$as_me: WARNING: --with-privatedir called without argument - will use default" >&2;}
;;
* )
-@@ -2583,13 +3164,13 @@
+@@ -2613,13 +3197,13 @@
# set root sbin directory location
# Check whether --with-rootsbindir was given.
@@ -2403,7 +2419,7 @@
$as_echo "$as_me: WARNING: --with-rootsbindir called without argument - will use default" >&2;}
;;
* )
-@@ -2603,13 +3184,13 @@
+@@ -2633,13 +3217,13 @@
# set lock directory location
# Check whether --with-lockdir was given.
@@ -2419,7 +2435,7 @@
$as_echo "$as_me: WARNING: --with-lockdir called without argument - will use default" >&2;}
;;
* )
-@@ -2623,13 +3204,13 @@
+@@ -2653,13 +3237,13 @@
# set state directory location
# Check whether --with-statedir was given.
@@ -2435,7 +2451,7 @@
$as_echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;}
;;
* )
-@@ -2643,13 +3224,13 @@
+@@ -2673,13 +3257,13 @@
# set cache directory location
# Check whether --with-cachedir was given.
@@ -2451,7 +2467,7 @@
$as_echo "$as_me: WARNING: --with-cachedir called without argument - will use default" >&2;}
;;
* )
-@@ -2663,13 +3244,13 @@
+@@ -2693,13 +3277,13 @@
# set pid directory location
# Check whether --with-piddir was given.
@@ -2467,7 +2483,7 @@
$as_echo "$as_me: WARNING: --with-piddir called without argument - will use default" >&2;}
;;
* )
-@@ -2683,13 +3264,13 @@
+@@ -2713,13 +3297,13 @@
# set ncalrpc directory location
# Check whether --with-ncalprcdir was given.
@@ -2483,7 +2499,7 @@
$as_echo "$as_me: WARNING: --with-ncalrpcdir called without argument - will use default" >&2;}
;;
* )
-@@ -2703,13 +3284,13 @@
+@@ -2733,13 +3317,13 @@
# set SWAT directory location
# Check whether --with-swatdir was given.
@@ -2499,7 +2515,7 @@
$as_echo "$as_me: WARNING: --with-swatdir called without argument - will use default" >&2;}
;;
* )
-@@ -2723,13 +3304,13 @@
+@@ -2753,13 +3337,13 @@
# set configuration directory location
# Check whether --with-configdir was given.
@@ -2515,7 +2531,7 @@
$as_echo "$as_me: WARNING: --with-configdir called without argument - will use default" >&2;}
;;
* )
-@@ -2743,13 +3324,13 @@
+@@ -2773,13 +3357,13 @@
# set log directory location
# Check whether --with-logfilebase was given.
@@ -2531,7 +2547,7 @@
$as_echo "$as_me: WARNING: --with-logfilebase called without argument - will use default" >&2;}
;;
* )
-@@ -2764,13 +3345,13 @@
+@@ -2794,13 +3378,13 @@
# set shared modules (internal lib) directory location
# Check whether --with-modulesdir was given.
@@ -2547,7 +2563,7 @@
$as_echo "$as_me: WARNING: --with-modulesdir without argument - will use default" >&2;}
;;
* )
-@@ -2784,13 +3365,13 @@
+@@ -2814,13 +3398,13 @@
# set PAM modules directory location
# Check whether --with-pammodulesdir was given.
@@ -2563,7 +2579,7 @@
$as_echo "$as_me: WARNING: --with-pammodulesdir called without argument - will use default" >&2;}
;;
* )
-@@ -2804,13 +3385,13 @@
+@@ -2834,13 +3418,13 @@
# set man directory location
# Check whether --with-mandir was given.
@@ -2579,7 +2595,7 @@
$as_echo "$as_me: WARNING: --with-mandir without argument - will use default" >&2;}
;;
* )
-@@ -2824,13 +3405,13 @@
+@@ -2854,13 +3438,13 @@
# set locale directory location
# Check whether --with-localedir was given.
@@ -2595,9 +2611,25 @@
$as_echo "$as_me: WARNING: --with-localedir called without argument - will use default" >&2;}
;;
*)
-@@ -2864,10 +3445,10 @@
+@@ -2874,13 +3458,13 @@
+ # set codepage directory location
+ # Check whether --with-codepagedir was given.
+-if test "${with_codepagedir+set}" = set; then
++if test "${with_codepagedir+set}" = set; then :
+ withval=$with_codepagedir; case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+- { $as_echo "$as_me:$LINENO: WARNING: --with-codepagedir called without argument - will use default" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-codepagedir called without argument - will use default" >&5
+ $as_echo "$as_me: WARNING: --with-codepagedir called without argument - will use default" >&2;}
+ ;;
+ * )
+@@ -2914,10 +3498,10 @@
+
# Check whether --with-selftest-prefix was given.
-if test "${with_selftest_prefix+set}" = set; then
+if test "${with_selftest_prefix+set}" = set; then :
@@ -2608,7 +2640,7 @@
$as_echo "$as_me: WARNING: --with-selftest-prefix called without argument - will use default" >&2;}
;;
* )
-@@ -2884,10 +3465,10 @@
+@@ -2934,10 +3518,10 @@
# Check whether --with-selftest-shrdir was given.
@@ -2621,7 +2653,7 @@
$as_echo "$as_me: WARNING: --with-selftest-shrdir called without argument - will use default" >&2;}
;;
* )
-@@ -2906,19 +3487,15 @@
+@@ -2956,19 +3540,15 @@
# Check whether --with-smbtorture4_path was given.
@@ -2644,7 +2676,7 @@
fi
smbtorture4_option="-t $withval"
;;
-@@ -2933,19 +3510,15 @@
+@@ -2983,19 +3563,15 @@
# Check whether --with-selftest_custom_conf was given.
@@ -2667,7 +2699,7 @@
fi
selftest_custom_conf="-c $withval"
;;
-@@ -2958,7 +3531,7 @@
+@@ -3008,7 +3584,7 @@
## so that we don't mix -O and -g
debug=no
# Check whether --enable-debug was given.
@@ -2676,7 +2708,7 @@
enableval=$enable_debug; if eval "test x$enable_debug = xyes"; then
debug=yes
fi
-@@ -2968,7 +3541,7 @@
+@@ -3018,7 +3594,7 @@
developer=no
# Check whether --enable-developer was given.
@@ -2685,7 +2717,7 @@
enableval=$enable_developer; if eval "test x$enable_developer = xyes"; then
debug=yes
developer=yes
-@@ -2978,7 +3551,7 @@
+@@ -3028,7 +3604,7 @@
krb5developer=no
# Check whether --enable-krb5developer was given.
@@ -2694,7 +2726,7 @@
enableval=$enable_krb5developer; if eval "test x$enable_krb5developer = xyes"; then
debug=yes
developer=yes
-@@ -2989,7 +3562,7 @@
+@@ -3039,7 +3615,7 @@
picky_developer=no
# Check whether --enable-picky-developer was given.
@@ -2703,7 +2735,7 @@
enableval=$enable_picky_developer; if eval "test x$enable_picky_developer = xyes"; then
debug=yes
developer=yes
-@@ -3000,7 +3573,7 @@
+@@ -3050,7 +3626,7 @@
# Check whether --with-cfenc was given.
@@ -2712,7 +2744,7 @@
withval=$with_cfenc;
# May be in source $withval/CoreFoundation/StringEncodings.subproj.
# Should have been in framework $withval/CoreFoundation.framework/Headers.
-@@ -3097,9 +3670,9 @@
+@@ -3147,9 +3723,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
@@ -2724,7 +2756,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3110,24 +3683,24 @@
+@@ -3160,24 +3736,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2754,7 +2786,7 @@
$as_echo "no" >&6; }
fi
-@@ -3137,9 +3710,9 @@
+@@ -3187,9 +3763,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
@@ -2766,7 +2798,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3150,24 +3723,24 @@
+@@ -3200,24 +3776,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2796,7 +2828,7 @@
$as_echo "no" >&6; }
fi
-@@ -3176,7 +3749,7 @@
+@@ -3226,7 +3802,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2805,7 +2837,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3190,9 +3763,9 @@
+@@ -3240,9 +3816,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
@@ -2817,7 +2849,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3203,24 +3776,24 @@
+@@ -3253,24 +3829,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2847,7 +2879,7 @@
$as_echo "no" >&6; }
fi
-@@ -3230,9 +3803,9 @@
+@@ -3280,9 +3856,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
@@ -2859,7 +2891,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3244,18 +3817,18 @@
+@@ -3294,18 +3870,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2881,7 +2913,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3274,10 +3847,10 @@
+@@ -3324,10 +3900,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2894,7 +2926,7 @@
$as_echo "no" >&6; }
fi
-@@ -3289,9 +3862,9 @@
+@@ -3339,9 +3915,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
@@ -2906,7 +2938,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3302,24 +3875,24 @@
+@@ -3352,24 +3928,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2936,7 +2968,7 @@
$as_echo "no" >&6; }
fi
-@@ -3333,9 +3906,9 @@
+@@ -3383,9 +3959,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
@@ -2948,7 +2980,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3346,24 +3919,24 @@
+@@ -3396,24 +3972,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2978,7 +3010,7 @@
$as_echo "no" >&6; }
fi
-@@ -3376,7 +3949,7 @@
+@@ -3426,7 +4002,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2987,7 +3019,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3387,73 +3960,55 @@
+@@ -3437,57 +4013,37 @@
fi
@@ -3008,17 +3040,6 @@
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler --version >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
@@ -3027,13 +3048,24 @@
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -v >&5") 2>&5
+- (eval "$ac_compiler --version >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -v >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -3050,8 +3082,8 @@
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
@@ -3063,30 +3095,20 @@
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--
-+#include <stdio.h>
+
int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+@@ -3503,8 +4059,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3470,17 +4025,17 @@
+ # The possible output files:
+@@ -3520,17 +4076,17 @@
done
rm -f $ac_rmfiles
@@ -3109,7 +3131,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3497,7 +4052,7 @@
+@@ -3547,7 +4103,7 @@
# certainly right.
break;;
*.* )
@@ -3118,17 +3140,19 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3516,84 +4071,75 @@
+@@ -3566,84 +4122,42 @@
else
ac_file=''
fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
+-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
+- $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -3142,70 +3166,64 @@
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
fi
-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
+-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
-+ { { 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
+- (eval "$ac_try") 2>&5
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $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 run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
+-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
- fi
+- fi
+- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
-
+-$as_echo "$cross_compiling" >&6; }
+-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
@@ -3228,7 +3246,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3608,32 +4154,24 @@
+@@ -3658,32 +4172,83 @@
esac
done
else
@@ -3244,8 +3262,9 @@
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
- rm -f conftest$ac_cv_exeext
+-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
@@ -3253,6 +3272,65 @@
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { 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:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { 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
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $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 C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
@@ -3268,7 +3346,7 @@
/* end confdefs.h. */
int
-@@ -3645,17 +4183,17 @@
+@@ -3695,17 +4260,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3291,7 +3369,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3668,31 +4206,23 @@
+@@ -3718,31 +4283,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3330,7 +3408,7 @@
/* end confdefs.h. */
int
-@@ -3706,37 +4236,16 @@
+@@ -3756,37 +4313,16 @@
return 0;
}
_ACEOF
@@ -3371,7 +3449,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3745,20 +4254,16 @@
+@@ -3795,20 +4331,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3395,7 +3473,7 @@
/* end confdefs.h. */
int
-@@ -3769,35 +4274,11 @@
+@@ -3819,35 +4351,11 @@
return 0;
}
_ACEOF
@@ -3434,7 +3512,7 @@
/* end confdefs.h. */
int
-@@ -3808,36 +4289,12 @@
+@@ -3858,36 +4366,12 @@
return 0;
}
_ACEOF
@@ -3475,7 +3553,7 @@
/* end confdefs.h. */
int
-@@ -3848,42 +4305,17 @@
+@@ -3898,42 +4382,17 @@
return 0;
}
_ACEOF
@@ -3520,7 +3598,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3900,18 +4332,14 @@
+@@ -3950,18 +4409,14 @@
CFLAGS=
fi
fi
@@ -3542,7 +3620,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3968,32 +4396,9 @@
+@@ -4018,32 +4473,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3576,7 +3654,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4004,17 +4409,19 @@
+@@ -4054,17 +4486,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3599,7 +3677,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4025,18 +4432,14 @@
+@@ -4075,18 +4509,14 @@
CFLAGS=$savedCFLAGS
if test x"$GCC" != x"yes" ; then
@@ -3621,7 +3699,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdbool.h>
-@@ -4178,32 +4581,9 @@
+@@ -4228,32 +4658,9 @@
for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
do
CC="$ac_save_CC $ac_arg"
@@ -3655,7 +3733,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c99" != "xno" && break
done
-@@ -4214,26 +4594,28 @@
+@@ -4264,26 +4671,28 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c99" in
x)
@@ -3689,7 +3767,7 @@
$as_echo "${GCC_VERSION}" >&6; }
fi
-@@ -4242,14 +4624,14 @@
+@@ -4292,14 +4701,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
@@ -3706,7 +3784,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4264,11 +4646,7 @@
+@@ -4314,11 +4723,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.
@@ -3719,7 +3797,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4277,78 +4655,34 @@
+@@ -4327,78 +4732,34 @@
#endif
Syntax error
_ACEOF
@@ -3803,7 +3881,7 @@
break
fi
-@@ -4360,7 +4694,7 @@
+@@ -4410,7 +4771,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -3812,7 +3890,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4371,11 +4705,7 @@
+@@ -4421,11 +4782,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.
@@ -3825,7 +3903,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4384,87 +4714,40 @@
+@@ -4434,87 +4791,40 @@
#endif
Syntax error
_ACEOF
@@ -3922,7 +4000,7 @@
fi
ac_ext=c
-@@ -4474,9 +4757,9 @@
+@@ -4524,9 +4834,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3934,7 +4012,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4487,7 +4770,7 @@
+@@ -4537,7 +4847,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3943,7 +4021,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4507,7 +4790,7 @@
+@@ -4557,7 +4867,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
@@ -3952,7 +4030,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4522,26 +4805,24 @@
+@@ -4572,26 +4882,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3984,7 +4062,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4555,7 +4836,7 @@
+@@ -4605,7 +4913,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3993,7 +4071,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4575,7 +4856,7 @@
+@@ -4625,7 +4933,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
@@ -4002,7 +4080,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4590,12 +4871,10 @@
+@@ -4640,12 +4948,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -4017,7 +4095,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4603,21 +4882,17 @@
+@@ -4653,21 +4959,17 @@
fi
fi
@@ -4043,7 +4121,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4632,48 +4907,23 @@
+@@ -4682,48 +4984,23 @@
return 0;
}
_ACEOF
@@ -4097,7 +4175,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4683,18 +4933,14 @@
+@@ -4733,18 +5010,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4119,7 +4197,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4704,14 +4950,10 @@
+@@ -4754,14 +5027,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4136,7 +4214,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4738,118 +4980,34 @@
+@@ -4788,118 +5057,34 @@
return 0;
}
_ACEOF
@@ -4268,7 +4346,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4860,139 +5018,8 @@
+@@ -4910,139 +5095,8 @@
@@ -4410,7 +4488,7 @@
MINIX=yes
else
MINIX=
-@@ -5001,34 +5028,23 @@
+@@ -5051,34 +5105,23 @@
if test "$MINIX" = yes; then
@@ -4451,7 +4529,7 @@
/* end confdefs.h. */
# define __EXTENSIONS__ 1
-@@ -5041,71 +5057,35 @@
+@@ -5091,71 +5134,35 @@
return 0;
}
_ACEOF
@@ -4534,7 +4612,7 @@
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
-@@ -5113,46 +5093,34 @@
+@@ -5163,46 +5170,34 @@
typedef int dummy;
_ACEOF
@@ -4603,7 +4681,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -5170,30 +5138,9 @@
+@@ -5220,30 +5215,9 @@
return 0;
}
_ACEOF
@@ -4636,7 +4714,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -5209,49 +5156,18 @@
+@@ -5259,49 +5233,18 @@
return 0;
}
_ACEOF
@@ -4689,7 +4767,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -5266,30 +5182,9 @@
+@@ -5316,30 +5259,9 @@
return 0;
}
_ACEOF
@@ -4722,7 +4800,7 @@
/* end confdefs.h. */
#include <limits.h>
-@@ -5304,51 +5199,20 @@
+@@ -5354,51 +5276,20 @@
return 0;
}
_ACEOF
@@ -4778,7 +4856,7 @@
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -5374,24 +5238,7 @@
+@@ -5424,24 +5315,7 @@
return 0;
}
_ACEOF
@@ -4804,7 +4882,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -5403,20 +5250,10 @@
+@@ -5453,20 +5327,10 @@
ac_cv_c_bigendian=unknown
fi
fi
@@ -4826,7 +4904,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -5436,81 +5273,43 @@
+@@ -5486,81 +5350,43 @@
return 0;
}
_ACEOF
@@ -4920,7 +4998,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -5519,41 +5318,17 @@
+@@ -5569,41 +5395,17 @@
#endif
_ACEOF
@@ -4964,7 +5042,7 @@
case $ac_cv_c_inline in
inline | yes) ;;
*)
-@@ -5573,14 +5348,10 @@
+@@ -5623,14 +5425,10 @@
saved_CFLAGS="$CFLAGS";
c99_init=no
if test x"$c99_init" = x"no"; then
@@ -4981,7 +5059,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5593,45 +5364,20 @@
+@@ -5643,45 +5441,20 @@
return 0;
}
_ACEOF
@@ -5032,7 +5110,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5644,45 +5390,20 @@
+@@ -5694,45 +5467,20 @@
return 0;
}
_ACEOF
@@ -5083,7 +5161,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5695,45 +5416,20 @@
+@@ -5745,45 +5493,20 @@
return 0;
}
_ACEOF
@@ -5134,7 +5212,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5746,45 +5442,20 @@
+@@ -5796,45 +5519,20 @@
return 0;
}
_ACEOF
@@ -5185,7 +5263,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -5797,34 +5468,13 @@
+@@ -5847,34 +5545,13 @@
return 0;
}
_ACEOF
@@ -5223,7 +5301,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-@@ -5843,7 +5493,7 @@
+@@ -5893,7 +5570,7 @@
else
CFLAGS="$saved_CFLAGS"
saved_CFLAGS=""
@@ -5232,7 +5310,7 @@
$as_echo "$as_me: WARNING: c99 structure initializer are not supported" >&2;}
fi
-@@ -5862,10 +5512,10 @@
+@@ -5912,10 +5589,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.
@@ -5245,7 +5323,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5873,11 +5523,11 @@
+@@ -5923,11 +5600,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5261,7 +5339,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -5914,7 +5564,7 @@
+@@ -5964,7 +5641,7 @@
;;
esac
@@ -5270,7 +5348,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -5930,7 +5580,7 @@
+@@ -5980,7 +5657,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -5279,7 +5357,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -5942,17 +5592,13 @@
+@@ -5992,17 +5669,13 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5300,7 +5378,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5977,54 +5623,27 @@
+@@ -6027,54 +5700,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -5363,7 +5441,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -6032,7 +5651,6 @@
+@@ -6082,7 +5728,6 @@
@@ -5371,7 +5449,7 @@
cat >>confdefs.h <<\EOF
#ifndef _XOPEN_SOURCE_EXTENDED
#define _XOPEN_SOURCE_EXTENDED 1
-@@ -6041,15 +5659,15 @@
+@@ -6091,15 +5736,15 @@
# Check whether --enable-largefile was given.
@@ -5390,7 +5468,7 @@
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -6058,11 +5676,7 @@
+@@ -6108,11 +5753,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.
@@ -5403,7 +5481,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6081,60 +5695,14 @@
+@@ -6131,60 +5772,14 @@
return 0;
}
_ACEOF
@@ -5466,7 +5544,7 @@
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -6142,23 +5710,19 @@
+@@ -6192,23 +5787,19 @@
rm -f conftest.$ac_ext
fi
fi
@@ -5494,7 +5572,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6177,38 +5741,11 @@
+@@ -6227,38 +5818,11 @@
return 0;
}
_ACEOF
@@ -5535,7 +5613,7 @@
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -6228,38 +5765,15 @@
+@@ -6278,38 +5842,15 @@
return 0;
}
_ACEOF
@@ -5576,7 +5654,7 @@
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -6271,17 +5785,13 @@
+@@ -6321,17 +5862,13 @@
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -5597,7 +5675,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6300,38 +5810,11 @@
+@@ -6350,38 +5887,11 @@
return 0;
}
_ACEOF
@@ -5638,7 +5716,7 @@
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -6351,38 +5834,15 @@
+@@ -6401,38 +5911,15 @@
return 0;
}
_ACEOF
@@ -5679,7 +5757,7 @@
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -6406,31 +5866,25 @@
+@@ -6456,31 +5943,25 @@
*hpux*)
# mmap on HPUX is completely broken...
@@ -5716,7 +5794,7 @@
if test "${GCC}" != "yes"; then
## for funky AIX compiler using strncpy()
-@@ -6442,7 +5896,6 @@
+@@ -6492,7 +5973,6 @@
@@ -5724,7 +5802,7 @@
cat >>confdefs.h <<\EOF
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600
-@@ -6452,7 +5905,6 @@
+@@ -6502,7 +5982,6 @@
@@ -5732,7 +5810,7 @@
cat >>confdefs.h <<\EOF
#ifndef _OSF_SOURCE
#define _OSF_SOURCE 1
-@@ -6469,9 +5921,7 @@
+@@ -6519,9 +5998,7 @@
*)
CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L"
@@ -5743,7 +5821,7 @@
;;
esac
-@@ -6480,9 +5930,7 @@
+@@ -6530,9 +6007,7 @@
*)
CFLAGS="$CFLAGS -D_SYSV"
@@ -5754,7 +5832,7 @@
;;
esac
-@@ -6491,978 +5939,385 @@
+@@ -6541,978 +6016,385 @@
@@ -6163,7 +6241,8 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
-test_array [0] = 0
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
+
- ;
- return 0;
-}
@@ -6200,8 +6279,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
-
+-
- ;
- return 0;
-}
@@ -6572,10 +6650,7 @@
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+
-+cat >>confdefs.h <<_ACEOF
-+#define uint32_t unsigned int
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -6612,7 +6687,9 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define uint32_t unsigned int
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -6622,11 +6699,6 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
-test_array [0] = 0
-+fi
-+
-+elif test $ac_cv_size_long -eq 4 ; then
-+ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
-+if test "x$ac_cv_type_int32_t" = x""yes; then :
- ;
- return 0;
@@ -6651,6 +6723,12 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
++fi
++
++elif test $ac_cv_size_long -eq 4 ; then
++ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
++if test "x$ac_cv_type_int32_t" = x""yes; then :
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -6988,7 +7066,7 @@
_ACEOF
-@@ -7470,717 +6325,429 @@
+@@ -7520,30402 +6402,2005 @@
# 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.
@@ -7014,7 +7092,8 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
-test_array [0] = 0
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
+
- ;
- return 0;
-}
@@ -7051,12 +7130,30 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
++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_fn_set_status 77
++as_fn_error "cannot compute sizeof (size_t)
++See \`config.log' for more details." "$LINENO" 5; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi
++fi
- ;
- return 0;
-}
--_ACEOF
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
++$as_echo "$ac_cv_sizeof_size_t" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -7076,24 +7173,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
++
++
++# 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 ssize_t" >&5
++$as_echo_n "checking size of ssize_t... " >&6; }
++if test "${ac_cv_sizeof_ssize_t+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t" "$ac_includes_default"; then :
+
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ if test "$ac_cv_type_size_t" = yes; then
++else
++ if test "$ac_cv_type_ssize_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_fn_set_status 77
-+as_fn_error "cannot compute sizeof (size_t)
++as_fn_error "cannot compute sizeof (ssize_t)
+See \`config.log' for more details." "$LINENO" 5; }; }
+ else
-+ ac_cv_sizeof_size_t=0
++ ac_cv_sizeof_ssize_t=0
+ fi
fi
@@ -7103,8 +7212,8 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-+$as_echo "$ac_cv_sizeof_size_t" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5
++$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -7122,7 +7231,10 @@
- ;
- return 0;
-}
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -7145,7 +7257,15 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++
++
++ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
++if test "x$ac_cv_type_intptr_t" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INTPTR_T 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -7159,8 +7279,13 @@
- ;
- return 0;
-}
++
++fi
++ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
++if test "x$ac_cv_type_uintptr_t" = x""yes; then :
++
+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
++#define HAVE_UINTPTR_T 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -7191,40 +7316,32 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
--fi
++
+ fi
++ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
++if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_PTRDIFF_T 1
++_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
-+$as_echo_n "checking size of ssize_t... " >&6; }
-+if test "${ac_cv_sizeof_ssize_t+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 (ssize_t))" "ac_cv_sizeof_ssize_t" "$ac_includes_default"; then :
- ac_lo= ac_hi=
-+else
-+ if test "$ac_cv_type_ssize_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_fn_set_status 77
-+as_fn_error "cannot compute sizeof (ssize_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_ssize_t=0
-+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test x"$ac_cv_type_long_long" != x"yes";then
++ as_fn_error "LIBREPLACE needs type 'long long'" "$LINENO" 5
++fi
++if test $ac_cv_sizeof_long_long -lt 8;then
++ as_fn_error "LIBREPLACE needs sizeof(long long) >= 8" "$LINENO" 5
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5
-+$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
@@ -7235,20 +7352,41 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++############################################
++# check if the compiler can do immediate structures
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immediate structures" >&5
++$as_echo_n "checking for immediate structures... " >&6; }
++if test "${libreplace_cv_immediate_structures+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++
++ #include <stdio.h>
++
+ int
+ main ()
+ {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
++
++ typedef struct {unsigned x;} FOOBAR;
++ #define X_FOOBAR(x) ((FOOBAR) { x })
++ #define FOO_ONE X_FOOBAR(1)
++ FOOBAR f = FOO_ONE;
++ static const struct {
++ FOOBAR y;
++ } f2[] = {
++ {FOO_ONE}
++ };
++ static const FOOBAR f3[] = {FOO_ONE};
-- ;
-- return 0;
--}
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -7269,12 +7407,20 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_immediate_structures=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ libreplace_cv_immediate_structures=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_immediate_structures" >&5
++$as_echo "$libreplace_cv_immediate_structures" >&6; }
++if test x"$libreplace_cv_immediate_structures" = x"yes"; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
@@ -7292,17 +7438,10 @@
- ac_cv_sizeof_short=0
- fi ;;
-esac
-+
-+ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
-+if test "x$ac_cv_type_intptr_t" = x""yes; then :
-+
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+
-+cat >>confdefs.h <<_ACEOF
-+#define intptr_t long long
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -7314,6 +7453,7 @@
-int
-main ()
-{
++$as_echo "#define HAVE_IMMEDIATE_STRUCTURES 1" >>confdefs.h
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
@@ -7336,9 +7476,6 @@
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+fi
-+
-+ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uintptr_t" = x""yes; then :
- ;
- return 0;
@@ -7367,7 +7504,7 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
- else
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -7389,25 +7526,38 @@
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-+cat >>confdefs.h <<_ACEOF
-+#define uintptr_t unsigned long long
-+_ACEOF
++echo "LIBREPLACE_CC_CHECKS: END"
+
++
++
++
++
++
++if test x"$teventdir" = "x"; then
++ teventdir=""
++ teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
++ for d in $teventpaths; do
++ if test -f "$d/tevent.c"; then
++ teventdir="$d"
++ break;
++ fi
++ done
++ if test x"$teventdir" = "x"; then
++ as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
++ fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-+ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
-+else
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-+#define ptrdiff_t unsigned long long
- _ACEOF
+-_ACEOF
-+fi
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
@@ -7416,22 +7566,8 @@
-{ $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
-+
-+if test x"$ac_cv_type_long_long" != x"yes";then
-+ as_fn_error "LIBREPLACE needs type 'long long'" "$LINENO" 5
-+fi
-+if test $ac_cv_sizeof_long_long -lt 8;then
-+ as_fn_error "LIBREPLACE needs sizeof(long long) >= 8" "$LINENO" 5
-+fi
-+
-+############################################
-+# check if the compiler can do immediate structures
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immediate structures" >&5
-+$as_echo_n "checking for immediate structures... " >&6; }
-+if test "${libreplace_cv_immediate_structures+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $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
@@ -7446,6 +7582,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
-test_array [0] = 0
++TEVENT_CFLAGS="-I$teventdir"
- ;
- return 0;
@@ -7476,32 +7613,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
-+
-+ #include <stdio.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-+
-+ typedef struct {unsigned x;} FOOBAR;
-+ #define X_FOOBAR(x) ((FOOBAR) { x })
-+ #define FOO_ONE X_FOOBAR(1)
-+ FOOBAR f = FOO_ONE;
-+ static const struct {
-+ FOOBAR y;
-+ } f2[] = {
-+ {FOO_ONE}
-+ };
-+ static const FOOBAR f3[] = {FOO_ONE};
++TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++for ac_header in sys/epoll.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_EPOLL_H 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -7522,14 +7654,9 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_immediate_structures=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_immediate_structures=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
@@ -7538,20 +7665,23 @@
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_immediate_structures" >&5
-+$as_echo "$libreplace_cv_immediate_structures" >&6; }
-+if test x"$libreplace_cv_immediate_structures" = x"yes"; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_IMMEDIATE_STRUCTURES 1" >>confdefs.h
++done
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in epoll_create
++do :
++ ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
++if test "x$ac_cv_func_epoll_create" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_EPOLL_CREATE 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -7561,7 +7691,6 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-test_array [0] = 0
-+fi
- ;
- return 0;
@@ -7599,6 +7728,8 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
++fi
++done
- ;
- return 0;
@@ -7623,18 +7754,13 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-+echo "LIBREPLACE_CC_CHECKS: END"
-+
-+
-+
-+# Check whether --enable-external_libtalloc was given.
-+if test "${enable_external_libtalloc+set}" = set; then :
-+ enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ enable_external_libtalloc=auto
-+fi
++if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
++ TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
++
++$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
@@ -7642,128 +7768,21 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-+
-+if test "x$enable_external_libtalloc" != xno
-+then
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+ ac_pt_PKG_CONFIG=$PKG_CONFIG
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $ac_pt_PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
- done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
+- done
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++if test x"$VERSIONSCRIPT" != "x"; then
++ EXPORTSFILE=tevent.exports
- ac_lo= ac_hi=
-+ if test "x$ac_pt_PKG_CONFIG" = x; then
-+ PKG_CONFIG=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
-+ fi
-+else
-+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.9.0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ PKG_CONFIG=""
-+ fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
@@ -7781,7 +7800,6 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-+fi
- ;
- return 0;
@@ -7796,18 +7814,7 @@
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
-+$as_echo_n "checking for TALLOC... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TALLOC_CFLAGS"; then
-+ pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -7817,69 +7824,30 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$TALLOC_LIBS"; then
-+ pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
++LIBTEVENT_OBJ0=""
++for obj in ${TEVENT_OBJ}; do
++ LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
++done
++
++LIBS="${LIBS} ${TEVENT_LIBS}"
- ac_lo=`expr '(' $ac_mid ')' + 1`
++SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
+
++SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
++## 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
-+ if test $_pkg_short_errors_supported = yes; then
-+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+ else
-+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$TALLOC_PKG_ERRORS" >&5
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ if x$enable_external_libtalloc = xyes; then
-+ as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+ else
-+ enable_external_libtalloc=no
-+ fi
-+
-+elif test $pkg_failed = untried; then
-+ if x$enable_external_libtalloc = xyes; then
-+ as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+ else
-+ enable_external_libtalloc=no
-+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
@@ -7897,7 +7865,7 @@
- ac_cv_sizeof_long=0
- fi ;;
-esac
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -7912,13 +7880,6 @@
-int
-main ()
-{
-+ TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
-+ TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ enable_external_libtalloc=yes
-+fi
-+fi
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
@@ -7940,13 +7901,6 @@
- /* 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" != 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"
- ;
- return 0;
@@ -7975,86 +7929,48 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
-+ break;
-+ fi
-+done
-+if test x"$tallocdir" = "x"; then
-+ as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
-+fi
-+TALLOC_OBJ="talloc.o"
-+
-+
-+TALLOC_CFLAGS="-I$srcdir/$tallocdir"
-+
-+
-+TALLOC_LIBS=""
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-+$as_echo_n "checking size of size_t... " >&6; }
-+if test "${ac_cv_sizeof_size_t+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+else
-+ if test "$ac_cv_type_size_t" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (size_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
- else
+- else
- ac_cv_sizeof_long=0
-+ ac_cv_sizeof_size_t=0
- fi
- fi
+- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-+
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-+$as_echo "$ac_cv_sizeof_size_t" >&6; }
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
- _ACEOF
+-_ACEOF
-@@ -8188,30229 +6755,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.
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
-+if test "${ac_cv_sizeof_void_p+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
@@ -8069,7 +7985,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
-test_array [0] = 0
--
+
- ;
- return 0;
-}
@@ -8106,7 +8022,6 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
- ;
- return 0;
@@ -8131,19 +8046,9 @@
- 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
@@ -8151,9 +8056,7 @@
- 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
@@ -8200,9 +8103,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. */
@@ -8246,46 +8147,19 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-+
-+if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: size_t cannot represent the amount of used memory of a process" >&5
-+$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please report this to <samba-technical at samba.org>" >&5
-+$as_echo "$as_me: WARNING: please report this to <samba-technical at samba.org>" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
-+$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
-+$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
-+ as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_lo= ac_hi=
-+ tallocdir=../lib/talloc
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+
-+if test x"$teventdir" = "x"; then
-+ teventdir=""
-+ teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
-+ for d in $teventpaths; do
-+ if test -f "$d/tevent.c"; then
-+ teventdir="$d"
-+ break;
-+ fi
-+ done
-+ if test x"$teventdir" = "x"; then
-+ as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
-+ fi
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
@@ -8303,30 +8177,11 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
- ;
- return 0;
-}
-+
-+
-+
-+TEVENT_CFLAGS="-I$teventdir"
-+
-+TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
-+
-+for ac_header in sys/epoll.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_EPOLL_H 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8351,10 +8206,10 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
@@ -8405,17 +8260,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
@@ -8456,23 +8305,12 @@
- 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
-+done
-+
-+if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
-+ TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
-+
-+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
-+
- fi
+-fi
-rm -f conftest.val
-+
-+if test x"$VERSIONSCRIPT" != "x"; then
-+ EXPORTSFILE=tevent.exports
-+
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
@@ -8481,16 +8319,8 @@
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-+LIBTEVENT_OBJ0=""
-+for obj in ${TEVENT_OBJ}; do
-+ LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
-+done
-+LIBS="${LIBS} ${TEVENT_LIBS}"
-+# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
-+# but currently this fails: things have to get merged from s4.
-+tdbdir="../lib/tdb"
-{ $as_echo "$as_me:$LINENO: checking for uint_t" >&5
-$as_echo_n "checking for uint_t... " >&6; }
@@ -8570,7 +8400,6 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
- ac_cv_type_uint_t=yes
-fi
@@ -8579,32 +8408,12 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+LIBTDB_OBJ0=""
-+for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
-+ common/traverse.o common/freelist.o common/freelistcheck.o \
-+ common/io.o common/lock.o common/open.o;
-+do
-+ LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
-+done
-fi
-+SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
-+
-+## cleanup the $(srcdir) in the Makefile if we are outside of the tree
-+if test "x${srcdir-.}" != "x."; then
-+ SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
-$as_echo "$ac_cv_type_uint_t" >&6; }
-if test "x$ac_cv_type_uint_t" = x""yes; then
@@ -8905,18 +8714,37 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_int16_t=yes
--fi
++
++# compile with optimization and without debugging by default, but
++# allow people to set their own preference.
++# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
++# if it has no value. This prevent *very* large debug binaries from occurring
++# by default.
++if test "x$debug" = "xyes" ; then
++ CFLAGS="${CFLAGS} -g"
++fi
++if test "x$CFLAGS" = x; then
++ CFLAGS="-O"
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++ enableval=$enable_socket_wrapper;
++fi
-fi
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++if eval "test x$developer = xyes"; then
++ enable_socket_wrapper=yes
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
-$as_echo "$ac_cv_type_int16_t" >&6; }
-if test "x$ac_cv_type_int16_t" = x""yes; then
@@ -8926,8 +8754,10 @@
-cat >>confdefs.h <<_ACEOF
-#define int16_t short
-_ACEOF
++if eval "test x$enable_socket_wrapper = xyes"; then
-fi
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
-{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
-$as_echo_n "checking for uint16_t... " >&6; }
@@ -9007,9 +8837,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ DEFAULT_TEST_OPTIONS=--socket-wrapper
++ HAVE_SOCKET_WRAPPER=yes
- ac_cv_type_uint16_t=yes
--fi
++ # this is only used for samba3
++ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
@@ -9020,7 +8854,11 @@
-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_type_uint16_t" >&5
-$as_echo "$ac_cv_type_uint16_t" >&6; }
-if test "x$ac_cv_type_uint16_t" = x""yes; then
@@ -9031,8 +8869,13 @@
-#define uint16_t unsigned short
-_ACEOF
--fi
++HAVE_NSS_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++ enable_nss_wrapper=yes
+ fi
++if eval "test x$enable_nss_wrapper = xyes"; then
-if test $ac_cv_sizeof_int -eq 4 ; then
-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
@@ -9113,9 +8956,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
- ac_cv_type_int32_t=yes
--fi
++ HAVE_NSS_WRAPPER=yes
++
++ # this is only used for samba3
++ NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
@@ -9123,40 +8971,10 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# compile with optimization and without debugging by default, but
-+# allow people to set their own preference.
-+# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
-+# if it has no value. This prevent *very* large debug binaries from occurring
-+# by default.
-+if test "x$debug" = "xyes" ; then
-+ CFLAGS="${CFLAGS} -g"
-+fi
-+if test "x$CFLAGS" = x; then
-+ CFLAGS="-O"
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Check whether --enable-socket-wrapper was given.
-+if test "${enable_socket_wrapper+set}" = set; then :
-+ enableval=$enable_socket_wrapper;
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
-$as_echo "$ac_cv_type_int32_t" >&6; }
-if test "x$ac_cv_type_int32_t" = x""yes; then
@@ -9167,12 +8985,7 @@
-#define int32_t int
-_ACEOF
-+DEFAULT_TEST_OPTIONS=
-+HAVE_SOCKET_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_socket_wrapper=yes
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
-$as_echo_n "checking for uint32_t... " >&6; }
@@ -9252,16 +9065,20 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if eval "test x$enable_socket_wrapper = xyes"; then
++SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
++SWAT_INSTALL_TARGETS=installswat
+
-+$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
-+
-+ DEFAULT_TEST_OPTIONS=--socket-wrapper
-+ HAVE_SOCKET_WRAPPER=yes
++# Check whether --enable-swat was given.
++if test "${enable_swat+set}" = set; then :
++ enableval=$enable_swat;
++ case "$enable_swat" in
++ no)
++ SWAT_SBIN_TARGETS=''
++ SWAT_INSTALL_TARGETS=''
++ ;;
++ esac
- ac_cv_type_uint32_t=yes
-+ # this is only used for samba3
-+ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -9270,20 +9087,10 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+# Check whether --enable-nss-wrapper was given.
-+if test "${enable_nss_wrapper+set}" = set; then :
-+ enableval=$enable_nss_wrapper;
- fi
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+HAVE_NSS_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_nss_wrapper=yes
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
-$as_echo "$ac_cv_type_uint32_t" >&6; }
-if test "x$ac_cv_type_uint32_t" = x""yes; then
@@ -9293,22 +9100,24 @@
-cat >>confdefs.h <<_ACEOF
-#define uint32_t unsigned int
-_ACEOF
-+if eval "test x$enable_nss_wrapper = xyes"; then
-+
-+$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
-elif test $ac_cv_size_long -eq 4 ; then
-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
-$as_echo_n "checking for int32_t... " >&6; }
-if test "${ac_cv_type_int32_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++# Probe the gcc version for extra CFLAGS. We always stash these in
++# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
++# Makefile edit, avoiding the need to re-run configure.
++if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
++ DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
++ # Add -Wdeclaration-after-statement if compiler supports it
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
++$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
++if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_int32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -9349,7 +9158,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -Wdeclaration-after-statement";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Wdeclaration_after_statement=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -9359,7 +9183,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9379,20 +9208,37 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Wdeclaration_after_statement=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_int32_t=yes
--fi
++ samba_cv_HAVE_Wdeclaration_after_statement=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
--fi
+ 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
@@ -9401,27 +9247,46 @@
-if test "x$ac_cv_type_int32_t" = x""yes; then
- :
-else
++ if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
++ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
++ fi
-cat >>confdefs.h <<_ACEOF
-#define int32_t long
-_ACEOF
++ #-Werror-implicit-function-declaration
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
++$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
++if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
-fi
-+SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
-+SWAT_INSTALL_TARGETS=installswat
-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
-$as_echo_n "checking for uint32_t... " >&6; }
-if test "${ac_cv_type_uint32_t+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=cross
+ else
- ac_cv_type_uint32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -9431,7 +9296,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9488,27 +9358,18 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Check whether --enable-swat was given.
-+if test "${enable_swat+set}" = set; then :
-+ enableval=$enable_swat;
-+ case "$enable_swat" in
-+ no)
-+ SWAT_SBIN_TARGETS=''
-+ SWAT_INSTALL_TARGETS=''
-+ ;;
-+ esac
-
+-
- ac_cv_type_uint32_t=yes
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+-
+-
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
@@ -9516,46 +9377,24 @@
-if test "x$ac_cv_type_uint32_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define uint32_t unsigned long
-_ACEOF
-
+-
-fi
-
-+# Probe the gcc version for extra CFLAGS. We always stash these in
-+# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
-+# Makefile edit, avoiding the need to re-run configure.
-+if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
-+ DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
-+ # Add -Wdeclaration-after-statement if compiler supports it
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
-+$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
-+if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-
+-else
-{ { $as_echo "$as_me:$LINENO: error: LIBREPLACE no 32-bit type found" >&5
-$as_echo "$as_me: error: LIBREPLACE no 32-bit type found" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking for int64_t" >&5
-$as_echo_n "checking for int64_t... " >&6; }
-if test "${ac_cv_type_int64_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-+
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-Wdeclaration-after-statement";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Wdeclaration_after_statement=cross
- else
+-else
- ac_cv_type_int64_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -9596,8 +9435,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 ()
@@ -9607,12 +9445,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9632,38 +9465,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Wdeclaration_after_statement=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_int64_t=yes
-+ samba_cv_HAVE_Wdeclaration_after_statement=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-
-
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
-+$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
-
+-
+-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
@@ -9671,46 +9487,25 @@
-if test "x$ac_cv_type_int64_t" = x""yes; then
- :
-else
-+ if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
-+ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
-+ fi
-
+-
-cat >>confdefs.h <<_ACEOF
-#define int64_t long long
-_ACEOF
-+ #-Werror-implicit-function-declaration
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
-+$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
-+if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
+-
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking for uint64_t" >&5
-$as_echo_n "checking for uint64_t... " >&6; }
-if test "${ac_cv_type_uint64_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-Werror-implicit-function-declaration";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=cross
- else
+-else
- ac_cv_type_uint64_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_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 ()
@@ -9754,12 +9549,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9779,121 +9569,41 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ samba_cv_HAVE_Werror_implicit_function_declaration=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-+
-
+-
- ac_cv_type_uint64_t=yes
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
-+$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
-+ if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
-+ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
-+ fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ # krb5developer is like developer, except we don't get
-+ # -Wstrict-prototypes.
-+ if test x"$krb5_developer" != x"$yes" ; then
-+ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
-+ fi
-
-+ if test x"$picky_developer" = x"yes"; then
-+ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+ fi
-+fi
-
-+# Check whether --enable-dmalloc was given.
-+if test "${enable_dmalloc+set}" = set; then :
-+ enableval=$enable_dmalloc;
- fi
-
+-
+-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test "x$enable_dmalloc" = xyes
-+then
-+
-+$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
-+
-+
-+$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
-+
-+ LIBS="$LIBS -ldmalloc"
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
-$as_echo "$ac_cv_type_uint64_t" >&6; }
-if test "x$ac_cv_type_uint64_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define uint64_t unsigned long long
-_ACEOF
-+#################################################
-+# check for a shared memory profiling support
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
-+$as_echo_n "checking whether to use profiling... " >&6; }
-+
-+# Check whether --with-profiling-data was given.
-+if test "${with_profiling_data+set}" = set; then :
-+ withval=$with_profiling_data; case "$withval" in
-+ yes)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define WITH_PROFILE 1" >>confdefs.h
-+
-+ samba_cv_WITH_PROFILE=yes
-+ ;;
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ samba_cv_WITH_PROFILE=no
-+ ;;
-+ esac
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- fi
-
-
+-
+-fi
+-
+-
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-+merged_build_possible=yes
-+
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -9964,49 +9674,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+ if test -n "$AWK"; then
-+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_AWK="$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
+-
- ac_cv_type_size_t=yes
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
-
+-
+-
-fi
-+ test -n "$AWK" && break
-+done
-+
-+# Check for GNU make
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
@@ -10014,27 +9696,18 @@
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
+-
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
-$as_echo_n "checking for ssize_t... " >&6; }
-if test "${ac_cv_type_ssize_t+set}" = set; then
-+
-+
-+for ac_prog in gmake make
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MAKE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_ssize_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -10091,28 +9764,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ case $MAKE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -10126,64 +9778,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+fi
-+MAKE=$ac_cv_path_MAKE
-+if test -n "$MAKE"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-+$as_echo "$MAKE" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_ssize_t=yes
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ test -n "$MAKE" && break
-+done
-
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
-+$as_echo_n "checking whether we have GNU make... " >&6; }
-+if test "${samba_cv_gnu_make+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
-+then
-+ samba_cv_gnu_make=no
-+else
-+ samba_cv_gnu_make=yes
- fi
-
+-
+-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-$as_echo "$ac_cv_type_ssize_t" >&6; }
-if test "x$ac_cv_type_ssize_t" = x""yes; then
- :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
-+$as_echo "$samba_cv_gnu_make" >&6; }
-+if test x$samba_cv_gnu_make = xyes; then
-+ true
- else
-+ merged_build_possible=no
-+fi
-
+-else
+-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
+-
-fi
-+# Check for perl
-
-
+-
+-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -11357,15 +10981,13 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
-$as_echo "$ac_cv_type_intptr_t" >&6; }
-if test "x$ac_cv_type_intptr_t" = x""yes; then
-- :
--else
-
-cat >>confdefs.h <<_ACEOF
--#define intptr_t long long
+-#define HAVE_INTPTR_T 1
-_ACEOF
-
+-
-fi
--
-{ $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5
-$as_echo_n "checking for uintptr_t... " >&6; }
-if test "${ac_cv_type_uintptr_t+set}" = set; then
@@ -11461,15 +11083,13 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
-$as_echo "$ac_cv_type_uintptr_t" >&6; }
-if test "x$ac_cv_type_uintptr_t" = x""yes; then
-- :
--else
-
-cat >>confdefs.h <<_ACEOF
--#define uintptr_t unsigned long long
+-#define HAVE_UINTPTR_T 1
-_ACEOF
-
+-
-fi
--
-{ $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-$as_echo_n "checking for ptrdiff_t... " >&6; }
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
@@ -11565,13 +11185,12 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-$as_echo "$ac_cv_type_ptrdiff_t" >&6; }
-if test "x$ac_cv_type_ptrdiff_t" = x""yes; then
-- :
--else
-
-cat >>confdefs.h <<_ACEOF
--#define ptrdiff_t unsigned long long
+-#define HAVE_PTRDIFF_T 1
-_ACEOF
-
+-
-fi
-
-
@@ -11667,982 +11286,9 @@
-
-
-
--# 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
-
--
--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:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--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:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $ac_pt_PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--if test -n "$ac_pt_PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--$as_echo "$ac_pt_PKG_CONFIG" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
-- if test "x$ac_pt_PKG_CONFIG" = x; then
-- PKG_CONFIG=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
-- PKG_CONFIG=$ac_pt_PKG_CONFIG
-- fi
--else
-- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
--fi
--
--fi
--if test -n "$PKG_CONFIG"; then
-- _pkg_min_version=0.9.0
-- { $as_echo "$as_me:$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:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- PKG_CONFIG=""
-- fi
--
--fi
--
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for TALLOC" >&5
--$as_echo_n "checking for TALLOC... " >&6; }
--
--if test -n "$PKG_CONFIG"; then
-- if test -n "$TALLOC_CFLAGS"; then
-- pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
-- else
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$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
-- pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- fi
--else
-- pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
-- if test -n "$TALLOC_LIBS"; then
-- pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
-- else
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$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
-- pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- fi
--else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-- else
-- TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$TALLOC_PKG_ERRORS" >&5
--
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- if x$enable_external_libtalloc = xyes; then
-- { { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
--$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
-- { (exit 1); exit 1; }; }
-- else
-- enable_external_libtalloc=no
-- fi
--
--elif test $pkg_failed = untried; then
-- if x$enable_external_libtalloc = xyes; then
-- { { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
--$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
-- { (exit 1); exit 1; }; }
-- else
-- enable_external_libtalloc=no
-- fi
--
--else
-- TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
-- TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- enable_external_libtalloc=yes
--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"
--
-- break;
-- fi
--done
--if test x"$tallocdir" = "x"; then
-- { { $as_echo "$as_me:$LINENO: error: cannot find talloc source in $tallocpaths" >&5
--$as_echo "$as_me: error: cannot find talloc source in $tallocpaths" >&2;}
-- { (exit 1); exit 1; }; }
--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:$LINENO: checking size of size_t" >&5
--$as_echo_n "checking size of size_t... " >&6; }
--if test "${ac_cv_sizeof_size_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=$ac_mid; break
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_lo=$ac_mid; break
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_lo= ac_hi=
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=$ac_mid
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_size_t=$ac_lo;;
--'') if test "$ac_cv_type_size_t" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-- else
-- ac_cv_sizeof_size_t=0
-- fi ;;
--esac
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--static long int longval () { return (long int) (sizeof (size_t)); }
--static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
--
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
-- return 1;
-- if (((long int) (sizeof (size_t))) < 0)
-- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (size_t))))
-- return 1;
-- fprintf (f, "%ld", i);
-- }
-- else
-- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (size_t))))
-- return 1;
-- fprintf (f, "%lu", i);
-- }
-- /* Do not output a trailing newline, as this causes \r\n confusion
-- on some platforms. */
-- return ferror (f) || fclose (f) != 0;
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_sizeof_size_t=`cat conftest.val`
--else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$ac_cv_type_size_t" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-- else
-- ac_cv_sizeof_size_t=0
-- fi
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.val
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
--$as_echo "$ac_cv_sizeof_size_t" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
--_ACEOF
--
--
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
--$as_echo_n "checking size of void *... " >&6; }
--if test "${ac_cv_sizeof_void_p+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- if test "$cross_compiling" = yes; then
-- # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=$ac_mid; break
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=-1 ac_mid=-1
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_lo=$ac_mid; break
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- done
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_lo= ac_hi=
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
-- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
--test_array [0] = 0
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_hi=$ac_mid
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_void_p=$ac_lo;;
--'') if test "$ac_cv_type_void_p" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-- else
-- ac_cv_sizeof_void_p=0
-- fi ;;
--esac
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--static long int longval () { return (long int) (sizeof (void *)); }
--static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
--
-- FILE *f = fopen ("conftest.val", "w");
-- if (! f)
-- return 1;
-- if (((long int) (sizeof (void *))) < 0)
-- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (void *))))
-- return 1;
-- fprintf (f, "%ld", i);
-- }
-- else
-- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (void *))))
-- return 1;
-- fprintf (f, "%lu", i);
-- }
-- /* Do not output a trailing newline, as this causes \r\n confusion
-- on some platforms. */
-- return ferror (f) || fclose (f) != 0;
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_sizeof_void_p=`cat conftest.val`
--else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$ac_cv_type_void_p" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-- else
-- ac_cv_sizeof_void_p=0
-- fi
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.val
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
--$as_echo "$ac_cv_sizeof_void_p" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
--_ACEOF
--
--
--
--if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
-- { $as_echo "$as_me:$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:$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:$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:$LINENO: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
--$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
-- { { $as_echo "$as_me:$LINENO: error: sizeof(size_t) < sizeof(void *)" >&5
--$as_echo "$as_me: error: sizeof(size_t) < sizeof(void *)" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--fi
--
--
--
--
-if test x"$teventdir" = "x"; then
- teventdir=""
- teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
@@ -12948,27 +11594,9 @@
-
-LIBS="${LIBS} ${TEVENT_LIBS}"
-
--# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
--# but currently this fails: things have to get merged from s4.
--tdbdir="../lib/tdb"
--
--TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
--
--
--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-.}/.."
@@ -13036,6 +11664,8 @@
-
-
-
+-
+-
-# 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"
@@ -13143,7 +11773,7 @@
-
-
- old_CFLAGS="$CFLAGS";
-- CFLAGS="-Wdeclaration-after-statement";
+- CFLAGS="$CFLAGS -Wdeclaration-after-statement";
- export CFLAGS;
- old_CPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS";
@@ -13230,7 +11860,7 @@
-
-
- old_CFLAGS="$CFLAGS";
-- CFLAGS="-Werror-implicit-function-declaration";
+- CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
- export CFLAGS;
- old_CPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS";
@@ -13318,27 +11948,6 @@
- fi
-fi
-
--# Check whether --enable-dmalloc was given.
--if test "${enable_dmalloc+set}" = set; then
-- enableval=$enable_dmalloc;
--fi
--
--
--if test "x$enable_dmalloc" = xyes
--then
--
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_DMALLOC 1
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define DMALLOC_FUNC_CHECK 1
--_ACEOF
--
-- LIBS="$LIBS -ldmalloc"
--fi
--
-#################################################
-# check for a shared memory profiling support
-{ $as_echo "$as_me:$LINENO: checking whether to use profiling" >&5
@@ -13976,7 +12585,7 @@
-
-
- old_CFLAGS="$CFLAGS";
-- CFLAGS="-Werror";
+- CFLAGS="$CFLAGS -Werror";
- export CFLAGS;
- old_CPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS";
@@ -14059,7 +12668,7 @@
-
-
- old_CFLAGS="$CFLAGS";
-- CFLAGS="-w2";
+- CFLAGS="$CFLAGS -w2";
- export CFLAGS;
- old_CPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS";
@@ -14142,7 +12751,7 @@
-
-
- old_CFLAGS="$CFLAGS";
-- CFLAGS="-errwarn=%all";
+- CFLAGS="$CFLAGS -errwarn=%all";
- export CFLAGS;
- old_CPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS";
@@ -14634,13 +13243,17 @@
-
-DYNEXP=
-
+-LDSHFLAGS_Z_DEFS=
-
+-LDSHFLAGS_Z_NODEFS=
+-
+-
-default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
-
--default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen"
+-default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia"
-
-if test "x$developer" = xyes; then
-- default_static_modules="$default_static_modules rpc_rpcecho"
+- default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
- default_shared_modules="$default_shared_modules charset_weird perfcount_test"
-fi
-
@@ -15111,7 +13724,15 @@
- { $as_echo "$as_me:$LINENO: result: $GLIBC_LFS_SUPPORT" >&5
-$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
- ;;
+- *qnx*)
+- CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-
+-cat >>confdefs.h <<\_ACEOF
+-#define _LARGEFILE64_SOURCE 1
+-_ACEOF
+-
+- ;;
+-
-esac
-
-SAVE_CPPFLAGS="${CPPFLAGS}"
@@ -15135,10 +13756,10 @@
- { (exit 1); exit 1; }; }
-fi
-
--LIBREPLACEOBJ="replace.o"
+-LIBREPLACEOBJ="$libreplacedir/replace.o"
-
-
--LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
+-LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
-
-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
@@ -17929,13 +16550,164 @@
-done
-
-
+-for ac_header in unix.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
+- ac_header_compiler=no
+-fi
-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
+- ac_header_preproc=no
+-fi
-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-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`
@@ -18148,7 +16920,8 @@
-
-
-
--for ac_func in waitpid strlcpy strlcat initgroups memmove strdup
+-
+-for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -22701,10 +21474,112 @@
-
-
-
+-for ac_func in getgrouplist
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
-# locale
-
-
--for ac_header in ctype.h locale.h
+-
+-for ac_header in ctype.h locale.h langinfo.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
@@ -24086,7 +22961,7 @@
-
-
-if test x"${libreplace_cv_dlfcn}" = x"yes";then
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
-fi
-
-LIBDL="$LIBS"
@@ -24282,7 +23157,7 @@
-#define REPLACE_GETPASS 1
-_ACEOF
-
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
-else
-
-{ $as_echo "$as_me:$LINENO: checking whether getpass should be replaced" >&5
@@ -24350,7 +23225,7 @@
-#define REPLACE_GETPASS 1
-_ACEOF
-
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
-fi
-
-fi
@@ -24421,7 +23296,7 @@
-#define REPLACE_STRPTIME 1
-_ACEOF
-
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} strptime.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
-fi
-
-
@@ -24747,7 +23622,7 @@
-_ACEOF
-
-else
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} timegm.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
-fi
-done
-
@@ -25299,7 +24174,7 @@
-#define REPLACE_READDIR_GETDIRENTRIES 1
-_ACEOF
-
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
- libreplace_cv_READDIR_NEEDED=no
-fi
-
@@ -25488,7 +24363,7 @@
-#define REPLACE_READDIR_GETDENTS 1
-_ACEOF
-
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
- libreplace_cv_READDIR_NEEDED=no
-fi
-
@@ -25791,7 +24666,7 @@
-_ACEOF
-
-else
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o"
+- LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o"
-fi
-
-
@@ -25799,8 +24674,7 @@
-
-
-
--
--for ac_func in syslog printf memset memcpy
+-for ac_func in printf memset memcpy
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -25908,6 +24782,111 @@
-echo "LIBREPLACE_BROKEN_CHECKS: END"
-
-
+-for ac_func in syslog
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+- { { $as_echo "$as_me:$LINENO: error: Required function not found" >&5
+-$as_echo "$as_me: error: Required function not found" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-done
+-
+-
-echo "LIBREPLACE_NETWORK_CHECKS: START"
-
-
@@ -29453,7 +28432,7 @@
-_ACEOF
-
-else
-- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"
+- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
-fi
-done
-
@@ -29635,7 +28614,7 @@
-#define REPLACE_INET_NTOA 1
-_ACEOF
-
-- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntoa.o"
+- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
-fi
-
-
@@ -29737,7 +28716,7 @@
-_ACEOF
-
-else
-- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_aton.o"
+- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
-fi
-done
-
@@ -29841,7 +28820,7 @@
-_ACEOF
-
-else
-- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntop.o"
+- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
-fi
-done
-
@@ -29945,7 +28924,7 @@
-_ACEOF
-
-else
-- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_pton.o"
+- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"
-fi
-done
-
@@ -30047,7 +29026,7 @@
-_ACEOF
-
-else
-- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getaddrinfo.o"
+- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
-fi
-
-
@@ -30477,7 +29456,7 @@
-_ACEOF
-
-else
-- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getifaddrs.o"
+- LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
-fi
-
-
@@ -30809,12 +29788,13 @@
-
-LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
-
--LIBREPLACE_OBJS=""
--for obj in ${LIBREPLACEOBJ}; do
-- LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
--done
+-LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
-
-
+-LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
+-
+-
+-
-# add -ldl to the global LIBS
-LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
@@ -35709,13 +34689,13 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
-
-
-
+-
+-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-
-
+-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -35723,17 +34703,8 @@
-{ $as_echo "$as_me:$LINENO: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
-+case "$host_os" in
-+ *irix*)
-+ # On IRIX, we prefer Freeware or Nekoware Perl, because the
-+ # system perl is so ancient.
-+ # Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PERL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_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
@@ -35822,25 +34793,7 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ 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
+- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -35894,8 +34847,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
-test_array [0] = 0
-+IFS=$as_save_IFS
-
+-
- ;
- return 0;
-}
@@ -35905,9 +34857,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -35931,15 +34881,11 @@
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -35947,10 +34893,8 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ { $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
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
@@ -35967,7 +34911,7 @@
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
@@ -35991,15 +34935,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-+ ;;
-+ *)
-+ # 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
-
@@ -36007,23 +34943,7 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ 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
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') if test "$ac_cv_type_short" = yes; then
@@ -36074,9 +34994,7 @@
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-+ done
-+IFS=$as_save_IFS
-
+-
- ;
- return 0;
-}
@@ -36096,8 +35014,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
@@ -36105,7 +35022,9 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=yes
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -36122,54 +35041,31 @@
- else
- ac_cv_sizeof_short=0
- fi
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
++ samba_cv_HAVE_Werror_implicit_function_declaration=no
+ fi
-rm -f conftest.val
-+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; }
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-
-
-+ ;;
-+esac
-
+-
+-
+-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-+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 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
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -36229,7 +35125,7 @@
- }
- return !cs[0] && !zero.x;
-#endif
--
+
- ;
- return 0;
-}
@@ -36253,41 +35149,47 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_const=yes
-+ if test -n "$AR"; then
-+ ac_cv_prog_AR="$AR" # Let the user override the test.
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
+
- ac_cv_c_const=no
-fi
-+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
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
++$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
++ if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
++ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
++ fi
+
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
--
++ # krb5developer is like developer, except we don't get
++ # -Wstrict-prototypes.
++ if test x"$krb5_developer" != x"$yes" ; then
++ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
++ fi
+
++ if test x"$picky_developer" = x"yes"; then
++ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
++ fi
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
@@ -36327,28 +35229,44 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_inline=$ac_kw
-+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
+-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
++#################################################
++# check for a shared memory profiling support
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
++$as_echo_n "checking whether to use profiling... " >&6; }
++# Check whether --with-profiling-data was given.
++if test "${with_profiling_data+set}" = set; then :
++ withval=$with_profiling_data; case "$withval" in
++ yes)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+
+-fi
++$as_echo "#define WITH_PROFILE 1" >>confdefs.h
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-done
++ samba_cv_WITH_PROFILE=yes
++ ;;
++ *)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ samba_cv_WITH_PROFILE=no
++ ;;
++ esac
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
--
--
+
+
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
@@ -36363,18 +35281,19 @@
-_ACEOF
- ;;
-esac
--
--
++merged_build_possible=yes
+
+
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
-+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
++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_ac_ct_AR+set}" = set; then :
++if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_c_bigendian=unknown
@@ -36409,8 +35328,8 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+ if test -n "$ac_ct_AR"; then
-+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++ if test -n "$AWK"; then
++ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
@@ -36419,7 +35338,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_AR="ar"
++ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
@@ -36435,19 +35354,22 @@
- esac
+fi
+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- fi
++fi
+
+-fi
++ test -n "$AWK" && break
++done
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
@@ -36459,7 +35381,8 @@
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/param.h>
--
++# Check for GNU make
+
-int
-main ()
-{
@@ -36468,7 +35391,7 @@
- && LITTLE_ENDIAN)
- bogus endian macros
- #endif
--
+
- ;
- return 0;
-}
@@ -36478,15 +35401,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ if test "x$ac_ct_AR" = x; then
-+ AR=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -36508,11 +35423,6 @@
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/param.h>
-+ AR=$ac_ct_AR
-+ fi
-+else
-+ AR="$ac_cv_prog_AR"
-+fi
-int
-main ()
@@ -36544,79 +35454,58 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
-+LD=ld
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${ac_cv_prog_gnu_ld+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ # 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; }
-+
- ac_cv_c_bigendian=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
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++for ac_prog in gmake make
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_MAKE+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
++ case $MAKE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
-
-+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; }
++ ;;
++esac
++fi
++MAKE=$ac_cv_path_MAKE
++if test -n "$MAKE"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
++$as_echo "$MAKE" >&6; }
+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
++ { $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 $ac_cv_c_bigendian = unknown; then
@@ -36626,45 +35515,30 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+set dummy $CC; ac_cc=`$as_echo "$2" |
-+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <limits.h>
-
- int
- main ()
- {
+-
+-int
+-main ()
+-{
-#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
-+# 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
@@ -36681,14 +35555,16 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <limits.h>
--
++ test -n "$MAKE" && break
++done
+
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
- not big endian
- #endif
--
+
- ;
- return 0;
-}
@@ -36696,19 +35572,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
@@ -36718,21 +35588,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
++$as_echo_n "checking whether we have GNU make... " >&6; }
++if test "${samba_cv_gnu_make+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_c_bigendian=no
--fi
--
++if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
++then
++ samba_cv_gnu_make=no
++else
++ samba_cv_gnu_make=yes
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
++$as_echo "$samba_cv_gnu_make" >&6; }
++if test x$samba_cv_gnu_make = xyes; then
++ true
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
--fi
--
++ merged_build_possible=no
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
@@ -36760,7 +35645,7 @@
- return ebcdic_mm[i] + ebcdic_ii[i];
- }
- extern int foo;
--
+
-int
-main ()
-{
@@ -36772,24 +35657,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
@@ -36812,10 +35686,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
++# Check for perl
+
+
-fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat >conftest.$ac_ext <<_ACEOF
@@ -36828,7 +35703,7 @@
-int
-main ()
-{
--
+
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
@@ -36837,7 +35712,7 @@
- } u;
- u.l = 1;
- return u.c[sizeof (long int) - 1] == 1;
--
+
- ;
- return 0;
-}
@@ -36845,74 +35720,119 @@
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 2>&5
-+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=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
+- (eval "$ac_try") 2>&5
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_bigendian=no
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; };
-+ then
-+ # cc works too.
-+ :
-+ else
-+ # cc exists but doesn't like -o.
-+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+ fi
-+ fi
-+ fi
++case "$host_os" in
++ *irix*)
++ # On IRIX, we prefer Freeware or Nekoware Perl, because the
++ # system perl is so ancient.
++ # Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ case $PERL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
++for as_dir in $as_dummy
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
++ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
++ ;;
++esac
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest*
-+
- fi
-+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
- fi
++ ;;
++ *)
++ # Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $PERL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
@@ -36925,7 +35845,7 @@
- no)
- ;; #(
- universal)
--
+
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
@@ -36938,19 +35858,31 @@
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
-+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
-+ BROKEN_CC=
++ ;;
++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
-+ BROKEN_CC=#
++ if test x"$debug" = x"yes";then
++ PERL="$PERL -W"
++ fi
++ export PERL
++ true
+fi
-{ $as_echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-$as_echo_n "checking whether char is unsigned... " >&6; }
-if test "${ac_cv_c_char_unsigned+set}" = set; then
-+{ $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 :
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -36958,37 +35890,18 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-Werror";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Werror=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0
-
+-
- ;
- return 0;
-}
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37008,19 +35921,30 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_char_unsigned=no
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror=yes
++ if test -n "$AR"; then
++ ac_cv_prog_AR="$AR" # Let the user override the test.
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_AR="${ac_tool_prefix}ar"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
- ac_cv_c_char_unsigned=yes
-+ samba_cv_HAVE_Werror=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
-$as_echo "$ac_cv_c_char_unsigned" >&6; }
@@ -37028,56 +35952,39 @@
- cat >>confdefs.h <<\_ACEOF
-#define __CHAR_UNSIGNED__ 1
-_ACEOF
-+
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-
+-
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-+{ $as_echo "$as_me:${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
-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="-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 test -z "$ac_cv_prog_AR"; then
++ ac_ct_AR=$AR
++ # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-
+-
-int
-main ()
-{
@@ -37085,11 +35992,7 @@
- ;
- return 0;
-}
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37109,49 +36012,68 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_signal=int
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_w2=yes
++ if test -n "$ac_ct_AR"; then
++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_AR="ar"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
- ac_cv_type_signal=void
-+ samba_cv_HAVE_w2=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
--
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
++ if test "x$ac_ct_AR" = x; then
++ AR=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ AR=$ac_ct_AR
++ fi
++else
++ AR="$ac_cv_prog_AR"
++fi
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-{ $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
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
-+$as_echo "$samba_cv_HAVE_w2" >&6; }
-+if test x"$samba_cv_HAVE_w2" = x"yes"; then
-+ Werror_FLAGS="-w2"
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
-+$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
-+if test "${samba_cv_HAVE_errwarn+set}" = set; then :
++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
- cat >conftest.$ac_ext <<_ACEOF
@@ -37159,90 +36081,132 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+ 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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <sys/types.h>
-
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-
+-_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_errwarn=yes
++ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++ ac_cv_prog_gnu_ld=yes
else
- ac_cv_type_uid_t=no
--fi
++ ac_cv_prog_gnu_ld=no
+ fi
-rm -f conftest*
-
-+ samba_cv_HAVE_errwarn=no
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
++$as_echo "$ac_cv_prog_gnu_ld" >&6; }
+
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
--
--
++
++if test "$ac_cv_prog_gnu_ld" = "yes"; then
++ ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release date" >&5
++$as_echo_n "checking GNU ld release date... " >&6; }
++ ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_date}" >&5
++$as_echo "${ac_cv_gnu_ld_date}" >&6; }
++ if test -n "$ac_cv_gnu_ld_date"; then
++ if test "$ac_cv_gnu_ld_date" -lt 20030217; then
++ ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++ fi
++ if test "$ac_cv_gnu_ld_date" -gt 20030101; then
++ ac_cv_gnu_ld_version_script=yes
++ fi
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version" >&5
++$as_echo_n "checking GNU ld release version... " >&6; }
++ ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
++ ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
++ ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version major" >&5
++$as_echo_n "checking GNU ld release version major... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_major}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version minor" >&5
++$as_echo_n "checking GNU ld release version minor... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
++ if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
++ ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++ fi
++ if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
++ ac_cv_gnu_ld_version_script=yes
++ fi
++ fi
++fi
+
+
-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
-
-+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: checking for mode_t" >&5
-$as_echo_n "checking for mode_t... " >&6; }
-if test "${ac_cv_type_mode_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++set dummy $CC; ac_cc=`$as_echo "$2" |
++ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_mode_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++
+ int
+ main ()
+ {
-if (sizeof (mode_t))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++rm -f conftest2.*
++if { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37270,13 +36234,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
@@ -37289,18 +36259,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-
+-
- ac_cv_type_mode_t=yes
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
@@ -37308,14 +36269,10 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
-+$as_echo "$samba_cv_HAVE_errwarn" >&6; }
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+ Werror_FLAGS="-errwarn=%all"
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-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
@@ -37326,21 +36283,13 @@
-#define mode_t int
-_ACEOF
-
- fi
-
+-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
-+############################################
-+# check if the compiler can handle negative enum values
-+# and don't truncate the values to INT_MAX
-+# a runtime test is needed here
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
-+$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
-+if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_off_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -37361,13 +36310,24 @@
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; };
++then
++ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++ if test "x$CC" != xcc; then
++ # Test first that cc exists at all.
++ if { ac_try='cc -c conftest.$ac_ext >&5'
++ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37395,13 +36355,21 @@
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++ rm -f conftest2.*
++ if { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -37411,78 +36379,77 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+
-+ 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; }
++ $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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
+-
- ac_cv_type_off_t=yes
--fi
-+ #include <stdio.h>
-+ enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-+ int main(void) {
-+ enum negative_values v1 = NEGATIVE_VALUE;
-+ unsigned v2 = NEGATIVE_VALUE;
++ 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
--else
++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
-+ if (v1 != 0xFFFFFFFF) {
-+ printf("%u != 0xFFFFFFFF\n", v1);
-+ return 1;
-+ }
-+ if (v2 != 0xFFFFFFFF) {
-+ printf("%u != 0xFFFFFFFF\n", v2);
-+ return 1;
-+ }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
-+ return 0;
-+ }
++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
-+else
-+ samba_cv__CC_NEGATIVE_ENUM_VALUES=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-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
- :
--else
-+{ $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
-
++if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
++ BROKEN_CC=
+ else
+-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
+-
++ BROKEN_CC=#
+ fi
--fi
-
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
++$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
++if test "${samba_cv_HAVE_Werror+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -37523,28 +36490,17 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+saved_CFLAGS="$CFLAGS";
-+c99_init=no
-+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
-+$as_echo_n "checking for C99 designated initializers... " >&6; }
-+ CFLAGS="$saved_CFLAGS";
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-if (sizeof ((size_t)))
- return 0;
-+ struct foo {int x;char y;};
-+ struct foo bar = { .y = 'X', .x = 1 };
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37567,68 +36523,91 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_type_size_t=yes
-fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -Werror";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Werror=cross
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++ int main(void)
++ {
++ return 0;
++ }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror=yes
++else
++ samba_cv_HAVE_Werror=no
fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
-else
--
+
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
+
+ fi
-
--fi
--
-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-$as_echo_n "checking for pid_t... " >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
++$as_echo "$samba_cv_HAVE_Werror" >&6; }
++if test x"$samba_cv_HAVE_Werror" = x"yes"; then
++ Werror_FLAGS="-Werror"
+ else
- ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
-+$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
-+ CFLAGS="$saved_CFLAGS -AC99";
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-if (sizeof (pid_t))
- return 0;
-+ struct foo {int x;char y;};
-+ struct foo bar = { .y = 'X', .x = 1 };
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37652,35 +36631,17 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
-+$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
-+ CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-if (sizeof ((pid_t)))
- return 0;
-+ struct foo {int x;char y;};
-+ struct foo bar = { .y = 'X', .x = 1 };
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37700,71 +36661,98 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_type_pid_t=yes
-fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -w2";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_w2=cross
else
- $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; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++ int main(void)
++ {
++ return 0;
++ }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_w2=yes
++else
++ samba_cv_HAVE_w2=no
fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
- :
-else
--
+
-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;
+
+ 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
--else
++{ $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
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
-+$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
-+ CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (ac_aggr.st_rdev)
-return 0;
-+ struct foo {int x;char y;};
-+ struct foo bar = { .y = 'X', .x = 1 };
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37784,43 +36772,49 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
++$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
++if test "${samba_cv_HAVE_errwarn+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: 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
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test x"$c99_init" = x"no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -c99" >&5
-+$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
-+ CFLAGS="$saved_CFLAGS -c99"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -errwarn=%all";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_errwarn=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_rdev)
-return 0;
-+ struct foo {int x;char y;};
-+ struct foo bar = { .y = 'X', .x = 1 };
+- ;
+- return 0;
+-}
+
- ;
- return 0;
- }
++ int main(void)
++ {
++ return 0;
++ }
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -37841,29 +36835,39 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=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_HAVE_errwarn=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ 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;
+
- ac_cv_member_struct_stat_st_rdev=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
++$as_echo "$samba_cv_HAVE_errwarn" >&6; }
++if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
++ Werror_FLAGS="-errwarn=%all"
++fi
fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "`uname`" = "HP-UX"; then
-+ if test "$ac_cv_c_compiler_gnu" = no; then
-+ # special override for broken HP-UX compiler - I can't find a way to test
-+ # this properly (its a compiler bug)
-+ CFLAGS="$CFLAGS -AC99";
-+ c99_init=yes;
-+ fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
@@ -37872,31 +36876,65 @@
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
-+if test x"$c99_init" = x"yes"; then
-+ saved_CFLAGS=""
-
++############################################
++# check if the compiler can handle negative enum values
++# and don't truncate the values to INT_MAX
++# a runtime test is needed here
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
++$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
++if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+else
-+ CFLAGS="$saved_CFLAGS"
-+ saved_CFLAGS=""
-+ as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
-+fi
++
++ if test "$cross_compiling" = yes; then :
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ #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
--_ACEOF
+ _ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
++else
++ samba_cv__CC_NEGATIVE_ENUM_VALUES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
--fi
-+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; }
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
++$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
++if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using --uint-enums for pidl" >&5
++$as_echo "$as_me: WARNING: using --uint-enums for pidl" >&2;}
++ PIDL_ARGS="$PIDL_ARGS --uint-enums"
++fi
-+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; }
-{ $as_echo "$as_me:$LINENO: checking for d_off in dirent" >&5
-$as_echo_n "checking for d_off in dirent... " >&6; }
@@ -37909,23 +36947,30 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+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; }
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
--int
--main ()
--{
++saved_CFLAGS="$CFLAGS";
++c99_init=no
++if test x"$c99_init" = x"no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
++$as_echo_n "checking for C99 designated initializers... " >&6; }
++ CFLAGS="$saved_CFLAGS";
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
+ int
+ main ()
+ {
-struct dirent d; d.d_off;
-- ;
-- return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++ struct foo bar = { .y = 'X', .x = 1 };
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -37945,45 +36990,30 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_dirent_d_off=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+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; }
-
+-
- ac_cv_dirent_d_off=no
--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; }
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_dirent_d_off" >&5
-$as_echo "$ac_cv_dirent_d_off" >&6; }
-if test $ac_cv_dirent_d_off = yes; then
-+ 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
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DIRENT_D_OFF 1
-_ACEOF
-+DYNEXP=
-
+-
-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
@@ -37995,17 +37025,26 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++if test x"$c99_init" = x"no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
++$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
++ CFLAGS="$saved_CFLAGS -AC99";
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
-if (sizeof (ssize_t))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++ struct foo bar = { .y = 'X', .x = 1 };
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38029,17 +37068,35 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test x"$c99_init" = x"no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
++$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
++ CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
-if (sizeof ((ssize_t)))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++ struct foo bar = { .y = 'X', .x = 1 };
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38062,72 +37119,37 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+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_ssize_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
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+#
-+# 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
-
--fi
-+ ;;
-+ esac
-+ ;;
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+-
+-
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-$as_echo "$ac_cv_type_ssize_t" >&6; }
-if test "x$ac_cv_type_ssize_t" = x""yes; then
- :
-else
-+#
-+# 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="
-+ ;;
-
+-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-+#
-+# 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
-
+-
-{ $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
-$as_echo_n "checking for wchar_t... " >&6; }
-if test "${ac_cv_type_wchar_t+set}" = set; then
@@ -38139,17 +37161,26 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++if test x"$c99_init" = x"no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
++$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
++ CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
-if (sizeof (wchar_t))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++ struct foo bar = { .y = 'X', .x = 1 };
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38173,17 +37204,35 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test x"$c99_init" = x"no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -c99" >&5
++$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
++ CFLAGS="$saved_CFLAGS -c99"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
-if (sizeof ((wchar_t)))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++ struct foo bar = { .y = 'X', .x = 1 };
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38203,59 +37252,35 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ;;
-+#
-+# 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*)
-
+-
- ac_cv_type_wchar_t=yes
--fi
-+$as_echo "#define SYSV 1" >>confdefs.h
-+
-+ case `uname -r` in
-+ 5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
-+$as_echo "no large file support" >&6; }
-+ ;;
-+ 5.*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+ if test "$ac_cv_c_compiler_gnu" = yes; then
-+ ${CC-cc} -v >conftest.c 2>&1
-+ ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
-+ rm -fr conftest.c
-+ case "$ac_cv_gcc_compiler_version_number" in
-+ *"gcc version 2.6"*|*"gcc version 2.7"*)
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
-+ LDFLAGS="$LDFLAGS -lthread"
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+-
+-
+ fi
-+ ;;
-+ *)
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+ LDFLAGS="$LDFLAGS -lthread"
-
--fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-
-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
++ # this properly (its a compiler bug)
++ CFLAGS="$CFLAGS -AC99";
++ c99_init=yes;
++ fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
-$as_echo "$ac_cv_type_wchar_t" >&6; }
-if test "x$ac_cv_type_wchar_t" = x""yes; then
@@ -38265,34 +37290,39 @@
-cat >>confdefs.h <<_ACEOF
-#define wchar_t unsigned short
-_ACEOF
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++if test x"$c99_init" = x"yes"; then
++ saved_CFLAGS=""
--fi
-+ ;;
-+ esac
-+ else
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+ LDFLAGS="$LDFLAGS -lthread"
++else
++ CFLAGS="$saved_CFLAGS"
++ saved_CFLAGS=""
++ as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
+ fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-############################################
-# for cups support we need libcups, and a handful of header files
++UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
++$as_echo_n "checking uname -s... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
++$as_echo "${UNAME_S}" >&6; }
-# Check whether --enable-cups was given.
-if test "${enable_cups+set}" = set; then
- enableval=$enable_cups;
-fi
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
++$as_echo_n "checking uname -r... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
++$as_echo "${UNAME_R}" >&6; }
-+ fi
-+ ;;
-+ esac
-+ ;;
-+#
-+# IRIX uses SYSV printing. Make sure to set that here
-+#
-+ *irix*)
++UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
++$as_echo_n "checking uname -m... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
++$as_echo "${UNAME_M}" >&6; }
-if test x$enable_cups != xno; then
- # Extract the first word of "cups-config", so it can be a program name with args.
@@ -38321,10 +37351,28 @@
-done
-done
-IFS=$as_save_IFS
-+$as_echo "#define SYSV 1" >>confdefs.h
++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; }
- ;;
--esac
++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
-fi
-CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
-if test -n "$CUPS_CONFIG"; then
@@ -38334,40 +37382,22 @@
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-+ ;;
-+ *freebsd*|*dragonfly*)
-+$as_echo "#define FREEBSD 1" >>confdefs.h
++DYNEXP=
-+ ;;
-+#
-+# 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"
++LDSHFLAGS_Z_DEFS=
- if test "x$CUPS_CONFIG" != x; then
-+$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
++LDSHFLAGS_Z_NODEFS=
- ac_save_CFLAGS=$CFLAGS
- ac_save_LDFLAGS=$LDFLAGS
- ac_save_PRINT_LIBS=$PRINT_LIBS
- CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
- LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-- PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
-+ ;;
-+ esac
-+ case "$CPPFLAGS" in
-+ *-D_SYSV*|*-D_SVID_SOURCE*)
-+ ;;
-+ *)
-+ CPPFLAGS="$CPPFLAGS -D_SYSV"
+- PRINT_LIBS="$PRINT_LIBS -lcups"
-+$as_echo "#define _SYSV 1" >>confdefs.h
++default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
-for ac_header in cups/cups.h cups/language.h
-do
@@ -38382,20 +37412,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+ esac
-+ ;;
-+#
-+# Tests needed for SINIX large file support.
-+#
-+ *sysv4*)
-+ if test $host = mips-sni-sysv4 ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+ old_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-+ if test "$cross_compiling" = yes; then :
-+ SINIX_LFS_SUPPORT=cross
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -38404,8 +37421,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
-#include <$ac_header>
-_ACEOF
@@ -38431,13 +37447,31 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia"
+
- ac_header_compiler=no
--fi
--
++if test "x$developer" = xyes; then
++ default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
++ default_shared_modules="$default_shared_modules charset_weird perfcount_test"
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
++#
++# Config CPPFLAG settings for strange OS's that must be set
++# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
++# case statement; its first reference must be unconditional.
++#
++case "$host_os" in
++ *hpux*)
++#
++# Defines needed for HPUX support.
++# HPUX has bigcrypt but (sometimes?) doesn't use it for
++# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
++#
++ case `uname -r` in
++ *9*|*10*|*11)
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -38449,15 +37483,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
-+}
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -38479,14 +37505,25 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
+
- ac_header_preproc=no
-fi
--
++ ;;
++ esac
++ ;;
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++#
++# CRAY Unicos has broken const handling
++ *unicos*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
++$as_echo "disabling const" >&6; }
++ CPPFLAGS="$CPPFLAGS -Dconst="
++ ;;
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -38521,41 +37558,255 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+if ac_fn_c_try_run "$LINENO"; then :
-+ SINIX_LFS_SUPPORT=yes
- 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; }
--
-+ SINIX_LFS_SUPPORT=no
- fi
++#
++# 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_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
++$as_echo "#define _LARGE_FILES 1" >>confdefs.h
+
+-fi
++ ;;
++#
++# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
++# to the existance of large files..
++# Note that -D_LARGEFILE64_SOURCE is different from the Sun
++# recommendations on large file support, however it makes the
++# compile work using gcc 2.7 and 2.8, whereas using the Sun
++# recommendation makes the compile fail on gcc2.7. JRA.
++#
++# Solaris uses SYSV printing. Make sure to set that here. --jerry
++#
++ *solaris*)
+
+-done
++$as_echo "#define SYSV 1" >>confdefs.h
+
+- if test x"$ac_cv_header_cups_cups_h" = xyes -a \
+- x"$ac_cv_header_cups_language_h" = xyes; then
++ case `uname -r` in
++ 5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
++$as_echo "no large file support" >&6; }
++ ;;
++ 5.*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++ if test "$ac_cv_c_compiler_gnu" = yes; then
++ ${CC-cc} -v >conftest.c 2>&1
++ ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
++ rm -fr conftest.c
++ case "$ac_cv_gcc_compiler_version_number" in
++ *"gcc version 2.6"*|*"gcc version 2.7"*)
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
++ LDFLAGS="$LDFLAGS -lthread"
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CUPS 1
+-_ACEOF
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
+- samba_cv_HAVE_CUPS=yes
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
+
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
+
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lcups $PRINT_LIBS $LIBS"
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+
++ ;;
++ esac
++ else
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
+
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
+
+- { $as_echo "$as_me:$LINENO: checking for httpConnectEncrypt in -lcups" >&5
+-$as_echo_n "checking for httpConnectEncrypt in -lcups... " >&6; }
+-if test "${ac_cv_lib_ext_cups_httpConnectEncrypt+set}" = set; then
+- $as_echo_n "(cached) " >&6
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++
++ fi
++ ;;
++ esac
++ ;;
++#
++# IRIX uses SYSV printing. Make sure to set that here
++#
++ *irix*)
++
++$as_echo "#define SYSV 1" >>confdefs.h
++
++ ;;
++ *freebsd*|*dragonfly*)
++
++$as_echo "#define FREEBSD 1" >>confdefs.h
++
++ ;;
++#
++# VOS may need to have POSIX support and System V compatibility enabled.
++#
++ *vos*)
++ case "$CPPFLAGS" in
++ *-D_POSIX_C_SOURCE*)
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
++
++$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
++
++ ;;
++ esac
++ case "$CPPFLAGS" in
++ *-D_SYSV*|*-D_SVID_SOURCE*)
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_SYSV"
++
++$as_echo "#define _SYSV 1" >>confdefs.h
++
++ esac
++ ;;
++#
++# Tests needed for SINIX large file support.
++#
++ *sysv4*)
++ if test $host = mips-sni-sysv4 ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ SINIX_LFS_SUPPORT=cross
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- 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 <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
+ #endif
+-char httpConnectEncrypt ();
+-int
+-main ()
+-{
+-return httpConnectEncrypt ();
+- ;
+- 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_ext_cups_httpConnectEncrypt=yes;
+- ac_cv_lib_ext_cups=yes
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ SINIX_LFS_SUPPORT=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
+- ac_cv_lib_ext_cups_httpConnectEncrypt=no;
+- ac_cv_lib_ext_cups=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-
++ SINIX_LFS_SUPPORT=no
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
+-$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
+- if test $ac_cv_lib_ext_cups_httpConnectEncrypt = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_HTTPCONNECTENCRYPT 1
+-_ACEOF
+-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
--done
+-LIBS=$ac_check_lib_ext_save_LIBS
+-
+-if test $ac_cv_lib_ext_cups = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCUPS 1
+-_ACEOF
+-
+- case "$PRINT_LIBS" in
+- *-lcups*)
+- ;;
+- *)
+- PRINT_LIBS="-lcups $PRINT_LIBS"
+- ;;
+- esac
+ 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
+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_CUPS 1
--_ACEOF
+-fi
+ CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
+ LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
+ LIBS="`getconf LFS64_LIBS` $LIBS"
@@ -38565,7 +37816,6 @@
+ fi
+ ;;
-- samba_cv_HAVE_CUPS=yes
- else
- { $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
-$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
@@ -38657,17 +37907,17 @@
+#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 */
-
- ;
- return 0;
++ /* Ensure this is kernel 2.4 or higher */
++
+ uname(&uts);
+ release = strdup(uts.release);
+ major = atoi(strsep(&release, "."));
@@ -38907,11 +38157,11 @@
-{ $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
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
-_ACEOF
--
+
-fi
+ CPPFLAGS="$old_CPPFLAGS"
+ if test x$GLIBC_LFS_SUPPORT = xyes ; then
@@ -38952,9 +38202,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
+ ;;
++ *qnx*)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-#undef $ac_func
-+esac
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -38969,8 +38221,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
++ ;;
-int
-main ()
@@ -38985,7 +38236,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_link") 2>conftest.er1
@@ -39005,11 +38256,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
-fi
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -39024,36 +38274,30 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+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"
+-
+-fi
+-done
--fi
-+ break;
-+ fi
- done
--
-if test x"$ac_cv_func_dirfd" = x"yes"; then
- default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-+if test x"$libreplacedir" = "x"; then
-+ as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
- fi
+-fi
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
-{ $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
--
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++echo "LIBREPLACE_BROKEN_CHECKS: START"
+
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
@@ -39090,30 +38334,36 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++libreplacedir=""
++libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
++for d in $libreplacepaths; do
++ if test -f "$d/replace.c"; then
++ libreplacedir="$d"
+
- samba_cv_struct_sigevent=no
--fi
-+LIBREPLACEOBJ="replace.o"
++ break;
++ fi
++done
++if test x"$libreplacedir" = "x"; then
++ as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
+ 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
++LIBREPLACEOBJ="$libreplacedir/replace.o"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_SIGEVENT 1
-_ACEOF
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
- { $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sival_ptr" >&5
-$as_echo_n "checking for struct sigevent.sigev_value.sival_ptr... " >&6; }
-if test "${ac_cv_member_struct_sigevent_sigev_value_sival_ptr+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -39121,7 +38371,8 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <signal.h>
--
++LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
+
-int
-main ()
-{
@@ -39151,7 +38402,11 @@
- 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 return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -39236,11 +38491,9 @@
-_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 ()
-{
@@ -39250,7 +38503,7 @@
- ;
- return 0;
-}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39270,27 +38523,19 @@
- 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*
-
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <signal.h>
-+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
++#include <sys/types.h>
-int
-main ()
@@ -39301,7 +38546,7 @@
- ;
- return 0;
-}
--_ACEOF
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39321,56 +38566,54 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=yes
--else
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "uid_t" >/dev/null 2>&1; then :
++ ac_cv_type_uid_t=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define uid_t int" >>confdefs.h
-
+-
- ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-+$as_echo "#define gid_t int" >>confdefs.h
++ ac_cv_type_uid_t=no
+ fi
++rm -f conftest*
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5
-$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; }
-if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then
-+
-+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
++{ $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
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-+#define mode_t int
- _ACEOF
+-_ACEOF
++$as_echo "#define uid_t int" >>confdefs.h
--
- 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 :
++$as_echo "#define gid_t int" >>confdefs.h
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking for struct timespec type" >&5
-$as_echo_n "checking for struct timespec type... " >&6; }
-if test "${samba_cv_struct_timespec+set}" = set; then
- $as_echo_n "(cached) " >&6
- else
-
+-else
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+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>
@@ -39386,10 +38629,8 @@
-# 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 :
++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 :
-int
-main ()
@@ -39425,7 +38666,7 @@
- samba_cv_struct_timespec=no
-fi
+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
++#define mode_t int
+_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -39436,13 +38677,13 @@
-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 :
++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 pid_t int
++#define off_t long int
_ACEOF
fi
@@ -39454,12 +38695,12 @@
-if test "${samba_cv_have_setresuid+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-+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 :
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
- if test "$cross_compiling" = yes; then
- samba_cv_have_setresuid=cross
--else
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -39468,8 +38709,9 @@
-/* end confdefs.h. */
-#include <errno.h>
-main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
++
+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
++#define size_t unsigned int
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -39504,9 +38746,16 @@
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
++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
fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
@@ -39515,16 +38764,16 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SETRESUID 1
++ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
+
-+ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ino_t" = x""yes; then :
-+
-+else
-+
+cat >>confdefs.h <<_ACEOF
-+#define ino_t unsigned
++#define HAVE_STRUCT_STAT_ST_RDEV 1
_ACEOF
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
++
fi
-# Do the same check for setresguid...
@@ -39534,11 +38783,12 @@
-if test "${samba_cv_have_setresgid+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-+if test "x$ac_cv_type_loff_t" = x""yes; then :
- if test "$cross_compiling" = yes; then
- samba_cv_have_setresgid=cross
++ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
++if test "x$ac_cv_type_ino_t" = x""yes; then :
++
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -39551,7 +38801,7 @@
-main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
+
+cat >>confdefs.h <<_ACEOF
-+#define loff_t off_t
++#define ino_t unsigned
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -39588,17 +38838,27 @@
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-+ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
-+if test "x$ac_cv_type_offset_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++if test "x$ac_cv_type_loff_t" = x""yes; then :
++
++else
++
++cat >>confdefs.h <<_ACEOF
++#define loff_t off_t
++_ACEOF
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresgid" >&5
-$as_echo "$samba_cv_have_setresgid" >&6; }
-if test x"$samba_cv_have_setresgid" = x"yes"; then
-+else
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SETRESGID 1
++ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
++if test "x$ac_cv_type_offset_t" = x""yes; then :
++
++else
++
+cat >>confdefs.h <<_ACEOF
+#define offset_t loff_t
_ACEOF
@@ -39626,7 +38886,7 @@
/* end confdefs.h. */
$ac_includes_default
int
-@@ -38445,44 +8703,17 @@
+@@ -37950,44 +8435,17 @@
return 0;
}
_ACEOF
@@ -39676,50 +38936,28 @@
$as_echo "$ac_cv_func_memcmp_working" >&6; }
test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
*" memcmp.$ac_objext "* ) ;;
-@@ -38492,166 +8723,418 @@
+@@ -37997,166 +8455,26 @@
-###############################################
-# 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`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
+-
-# test for where we get readline() from
-{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5
-$as_echo_n "checking whether to use readline... " >&6; }
-+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`
-+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 readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39727,304 +38965,25 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+for ac_header in setjmp.h utime.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdint_h" = x""yes; then :
-+ ac_config_commands="$ac_config_commands rm-stdint.h"
-+
-+else
-+ ac_config_commands="$ac_config_commands mk-stdint.h"
-+
-+
-+fi
-+
-+
-+
-+ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdbool_h" = x""yes; then :
-+ ac_config_commands="$ac_config_commands rm-stdbool.h"
-+
-+else
-+ ac_config_commands="$ac_config_commands mk-stdbool.h"
-+
-+
-+fi
-+
-+
-+
-+
-+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
-+
-+"
-+if test "x$ac_cv_type_bool" = x""yes; then :
-+
-+$as_echo "#define HAVE_BOOL 1" >>confdefs.h
-+
-+fi
-+
-+
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
-+
-+"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
-+
-+$as_echo "#define HAVE__Bool 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-+$as_echo_n "checking for working mmap... " >&6; }
-+if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-+else
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_MMAP=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include "$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
+- $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; }
-+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
+-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. */
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <unistd.h>
-+int
-+main ()
-+{
-+int i = (int)setresuid
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_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. */
+-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+#include <unistd.h>
-+int
-+main ()
-+{
-+int i = (int)setresgid
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -40044,56 +39003,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setresgid_decl=yes
-+else
-+ ac_cv_have_setresgid_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
-+$as_echo "$ac_cv_have_setresgid_decl" >&6; }
-+ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
-+$as_echo_n "checking for errno declaration... " >&6; }
-+if test "${ac_cv_have_errno_decl+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <errno.h>
-+int
-+main ()
-+{
-+int i = (int)errno
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_errno_decl=yes
-+else
-+ ac_cv_have_errno_decl=no
- fi
+-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
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -40102,37 +39022,16 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
-+$as_echo_n "checking for secure mkstemp... " >&6; }
-+if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#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);
-+}
++for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -40152,28 +39051,18 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=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
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- ac_header_preproc=no
fi
-+{ $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
++done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -40210,7 +39099,7 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -40220,7 +39109,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 stdio.h strings.h
++for ac_header in stdbool.h stdint.h sys/select.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -40229,7 +39118,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -38660,626 +9143,265 @@
+@@ -38165,149 +8483,12 @@
done
@@ -40247,10 +39136,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40262,12 +39148,7 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+ ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_SNPRINTF $ac_have_decl
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -40287,17 +39168,13 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-+ ac_have_decl=0
- 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; }
@@ -40312,9 +39189,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VSNPRINTF $ac_have_decl
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40333,17 +39208,13 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-+ ac_have_decl=0
- 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; }
@@ -40382,47 +39253,36 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ASPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ ac_have_decl=0
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VASPRINTF $ac_have_decl
-+_ACEOF
-+
-+for ac_func in snprintf vsnprintf asprintf vasprintf
++for ac_header in setjmp.h utime.h
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
- fi
--
+@@ -38317,474 +8498,97 @@
done
++ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdint_h" = x""yes; then :
++ ac_config_commands="$ac_config_commands rm-stdint.h"
+
-
--
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40430,16 +39290,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 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
+- $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; }
@@ -40471,51 +39328,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_C99_VSNPRINTF=cross
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
+-
- ac_header_compiler=no
-fi
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+void foo(const char *format, ...) {
-+ va_list ap;
-+ int len;
-+ char buf[20];
-+ long long l = 1234567890;
-+ l *= 100;
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+ va_start(ap, format);
-+ len = vsnprintf(buf, 0, format, ap);
-+ va_end(ap);
-+ if (len != 5) exit(1);
-+
-+ 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"); }
++ ac_config_commands="$ac_config_commands mk-stdint.h"
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -40527,7 +39350,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40546,28 +39369,17 @@
- 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
- 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: )
@@ -40604,7 +39416,7 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -40623,11 +39435,8 @@
-{ $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 :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${termlib} $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -40636,6 +39445,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdbool_h" = x""yes; then :
++ ac_config_commands="$ac_config_commands rm-stdbool.h"
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -40644,19 +39456,14 @@
-extern "C"
-#endif
-char tgetent ();
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+va_list ap1,ap2;
- int
- main ()
- {
+-int
+-main ()
+-{
-return tgetent ();
-+va_copy(ap1,ap2);
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -40679,23 +39486,19 @@
- $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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_config_commands="$ac_config_commands mk-stdbool.h"
+
- eval "$as_ac_Lib=no"
-+ libreplace_cv_HAVE_VA_COPY=no
- fi
--
+-fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -40704,24 +39507,14 @@
- $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
-+
fi
- done
- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-+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
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $TERMLIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -40738,19 +39531,14 @@
-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;
- int
- main ()
- {
+-int
+-main ()
+-{
-return rl_callback_handler_install ();
-+__va_copy(ap1,ap2);
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -40773,42 +39561,41 @@
- $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
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_lib_readline_rl_callback_handler_install=no
-+ libreplace_cv_HAVE___VA_COPY=no
- fi
--
+-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
+-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___VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
++ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
++$ac_includes_default
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
-+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
++"
++if test "x$ac_cv_type_bool" = x""yes; then :
- break
-else
- TERMLIBS=
+-fi
++$as_echo "#define HAVE_BOOL 1" >>confdefs.h
+
fi
--
- fi
-done
-
@@ -40831,8 +39618,8 @@
- 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`
@@ -40840,16 +39627,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 __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
+- $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; }
@@ -40858,20 +39642,11 @@
-_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_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
+ $ac_includes_default
-#include <$ac_header>
-+#include <stdio.h>
-+int
-+main ()
-+{
-+printf("%s\n", __FUNCTION__);
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -40891,23 +39666,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_FUNCTION_MACRO=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-+ libreplace_cv_HAVE_FUNCTION_MACRO=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
+
+-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_HAVE_FUNCTION_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
-+if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
++"
++if test "x$ac_cv_type__Bool" = x""yes; then :
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -40917,27 +39690,210 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define HAVE__Bool 1" >>confdefs.h
+
+- ac_header_preproc=no
+ fi
+
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
++$as_echo_n "checking for working mmap... " >&6; }
++if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- eval "$as_ac_Header=\$ac_header_preproc"
+
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_MMAP=cross
+else
-+ { $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
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include "$libreplacedir/test/shared_mmap.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_MMAP=yes
+else
++ libreplace_cv_HAVE_MMAP=no
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
++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
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
++
++for ac_header in sys/syslog.h syslog.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++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
+@@ -38793,149 +8597,40 @@
+
+ done
+
+-
+-for ac_header in readline/history.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
-#include <$ac_header>
-+#include <stdio.h>
-+int
-+main ()
-+{
-+printf("%s\n", __func__);
-+ ;
-+ return 0;
-+}
++for ac_header in sys/time.h time.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_header_compiler=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
++done
+
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
++for ac_header in 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
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40956,26 +39912,17 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_func_MACRO=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_preproc=no
-+ libreplace_cv_HAVE_func_MACRO=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
-+ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
-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_func_MACRO 1" >>confdefs.h
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -41012,18 +39959,18 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ fi
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++done
-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/param.h limits.h
++for ac_header in sys/mount.h mntent.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -41032,11 +39979,23 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -39289,393 +9411,295 @@
+@@ -38944,733 +8639,569 @@
+
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
--for ac_header in readline/history.h
++fi
+
++done
+
+-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -41044,24 +40003,12 @@
-$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
-+ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
-+if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
-+
-+$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
-+
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
-+$as_echo_n "checking for setenv declaration... " >&6; }
-+if test "${ac_cv_have_setenv_decl+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -41070,19 +40017,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. */
-$ac_includes_default
-#include <$ac_header>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+int i = (int)setenv
-+ ;
-+ return 0;
-+}
++for ac_header in unix.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "unix.h" "ac_cv_header_unix_h" "$ac_includes_default"
++if test "x$ac_cv_header_unix_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_UNIX_H 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -41103,39 +40046,42 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setenv_decl=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
-+ ac_cv_have_setenv_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_setenv_decl" >&5
-+$as_echo "$ac_cv_have_setenv_decl" >&6; }
-+ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
++done
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
+
-+ fi
++fi
++done
+
-+for ac_func in setenv unsetenv
++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"
@@ -41173,6 +40119,15 @@
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -41207,39 +40162,1066 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
-+$as_echo_n "checking for environ declaration... " >&6; }
-+if test "${ac_cv_have_environ_decl+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++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
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $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
++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
-- eval "$as_ac_Header=\$ac_header_preproc"
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l${termlib} $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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 tgetent ();
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <unistd.h>
+ int
+ main ()
+ {
+-return tgetent ();
++int i = (int)setresuid
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_Lib=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresuid_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_Lib=no"
++ 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
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++$as_echo "#define HAVE_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)environ
++int i = (int)setresgid
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_environ_decl=yes
++ ac_cv_have_setresgid_decl=yes
+else
-+ ac_cv_have_environ_decl=no
++ ac_cv_have_setresgid_decl=no
fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
+-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Lib'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- TERMLIBS="-l${termlib}"; break
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5
++$as_echo "$ac_cv_have_setresgid_decl" >&6; }
++ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then
+
+- done
+- { $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_SETRESGID_DECL 1" >>confdefs.h
++
++ fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
++$as_echo_n "checking for errno declaration... " >&6; }
++if test "${ac_cv_have_errno_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMLIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char rl_callback_handler_install ();
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <errno.h>
+ int
+ main ()
+ {
+-return rl_callback_handler_install ();
++int i = (int)errno
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_readline_rl_callback_handler_install=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_errno_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_have_errno_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_errno_decl" >&5
++$as_echo "$ac_cv_have_errno_decl" >&6; }
++ if test x"$ac_cv_have_errno_decl" = x"yes"; then
++
++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
++
++ fi
+
+- ac_cv_lib_readline_rl_callback_handler_install=no
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
++$as_echo_n "checking for secure mkstemp... " >&6; }
++if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++main() {
++ struct stat st;
++ char tpl[20]="/tmp/test.XXXXXX";
++ int fd = mkstemp(tpl);
++ if (fd == -1) exit(1);
++ unlink(tpl);
++ if (fstat(fd, &st) != 0) exit(1);
++ if ((st.st_mode & 0777) != 0600) exit(1);
++ exit(0);
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_SECURE_MKSTEMP=yes
++else
++ libreplace_cv_HAVE_SECURE_MKSTEMP=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
+-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
+-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
+- TERMLDFLAGS="-L$with_readline/lib"
+- TERMCPPFLAGS="-I$with_readline/include"
+- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
+- TERMLIBS="-lreadline $TERMLIBS"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
++$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
++if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBREADLINE 1
+-_ACEOF
++$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
+
+- break
+-else
+- TERMLIBS= CPPFLAGS=$_cppflags
+ fi
+
++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
++
+ fi
+
+ done
+
++ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
++fi
+
+- LDFLAGS=$_ldflags
+- ;;
+- esac
++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
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ ac_have_decl=0
++fi
++
++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
+
++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
+
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VASPRINTF $ac_have_decl
++_ACEOF
+
++for ac_func in snprintf vsnprintf asprintf vasprintf
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++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
+
+-# 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 C99 vsnprintf" >&5
++$as_echo_n "checking for C99 vsnprintf... " >&6; }
++if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMLIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char rl_completion_matches ();
+-int
+-main ()
+-{
+-return rl_completion_matches ();
+- ;
+- return 0;
++#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
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_readline_rl_completion_matches=yes
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
+- ac_cv_lib_readline_rl_completion_matches=no
++ libreplace_cv_HAVE_C99_VSNPRINTF=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+-$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+-if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
++$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
++if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NEW_LIBREADLINE 1
+-_ACEOF
++$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
+
+ fi
+
+
+-# not all readline libs have rl_event_hook or history_list
+-{ $as_echo "$as_me:$LINENO: checking whether rl_event_hook is declared" >&5
+-$as_echo_n "checking whether rl_event_hook is declared... " >&6; }
+-if test "${ac_cv_have_decl_rl_event_hook+set}" = set; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
++$as_echo_n "checking for va_copy... " >&6; }
++if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <readline/readline.h>
+
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdarg.h>
++va_list ap1,ap2;
+ int
+ main ()
+ {
+-#ifndef rl_event_hook
+- (void) rl_event_hook;
+-#endif
+-
++va_copy(ap1,ap2);
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_have_decl_rl_event_hook=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE_VA_COPY=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_have_decl_rl_event_hook=no
++ libreplace_cv_HAVE_VA_COPY=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:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
+-$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; }
+-if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_RL_EVENT_HOOK 1
+-_ACEOF
+-
+-
+-else
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_RL_EVENT_HOOK 0
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
+
++$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
+
+ fi
+
+-
+-{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
+-$as_echo_n "checking for history_list in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_history_list+set}" = set; then
++if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5
++$as_echo_n "checking for __va_copy... " >&6; }
++if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMLIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_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 history_list ();
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdarg.h>
++va_list ap1,ap2;
+ int
+ main ()
+ {
+-return history_list ();
++__va_copy(ap1,ap2);
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_readline_history_list=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE___VA_COPY=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_readline_history_list=no
++ libreplace_cv_HAVE___VA_COPY=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
++
++$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
+-$as_echo "$ac_cv_lib_readline_history_list" >&6; }
+-if test "x$ac_cv_lib_readline_history_list" = x""yes; then
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
++$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_HISTORY_LIST 1
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++printf("%s\n", __FUNCTION__);
++ ;
++ return 0;
++}
+ _ACEOF
+-
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_FUNCTION_MACRO=yes
++else
++ libreplace_cv_HAVE_FUNCTION_MACRO=no
+ fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
++if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
+
++$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
+
+-###############################################
+-# test for where we get yp_get_default_domain() from
+-{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
+-$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
+-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
++$as_echo_n "checking for __func__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* 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 yp_get_default_domain ();
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
+ int
+ main ()
+ {
+-return yp_get_default_domain ();
++printf("%s\n", __func__);
+ ;
+ return 0;
+ }
+ _ACEOF
+-for ac_lib in '' nsl; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_search_yp_get_default_domain=$ac_res
++if 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
++ libreplace_cv_HAVE_func_MACRO=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
++ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
+
++$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
+
++ fi
fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+- break
++for ac_header in sys/param.h limits.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
++
+ done
+-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+- :
+-else
+- ac_cv_search_yp_get_default_domain=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
+-$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
+-ac_res=$ac_cv_search_yp_get_default_domain
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+-fi
+
++ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
++if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
+
+-for ac_func in yp_get_default_domain
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
++$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++fi
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
++$as_echo_n "checking for setenv declaration... " >&6; }
++if test "${ac_cv_have_setenv_decl+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++int i = (int)setenv
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setenv_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ ac_cv_have_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
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
++$as_echo "$ac_cv_have_setenv_decl" >&6; }
++ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
++
++$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
++
++ fi
++
++for ac_func in setenv unsetenv
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -39679,101 +9210,56 @@
+ done
+
+
+-# Check if we have execl, if not we need to compile smbrun.
+-
+-for ac_func in execl
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
++$as_echo_n "checking for environ declaration... " >&6; }
++if test "${ac_cv_have_environ_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <unistd.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++int i = (int)environ
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_environ_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ ac_cv_have_environ_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
+$as_echo "$ac_cv_have_environ_decl" >&6; }
+ if test x"$ac_cv_have_environ_decl" = x"yes"; then
@@ -41253,12 +41235,21 @@
+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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_STRNLEN 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
fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+done
+
+for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
@@ -41267,84 +41258,106 @@
+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
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -39781,353 +9267,184 @@
+ fi
done
+-if test x"$ac_cv_func_execl" = x"no"; then
+- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+-fi
+# this test disabled as we don't actually need __VA_ARGS__ yet
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+#define eprintf(...) fprintf(stderr, __VA_ARGS__)
+eprintf("bla", "bar");
-+
+
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
--for ac_header in readline.h readline/readline.h
++fi
++rm -f conftest.err conftest.$ac_ext
+
+
+-for ac_func in getcwd fchown chmod fchmod mknod mknod64
-do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+rm -f conftest.err conftest.$ac_ext
-+
-+
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
+$as_echo_n "checking for sig_atomic_t type... " >&6; }
+if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
+ $as_echo_n "(cached) " >&6
else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
+-/* end confdefs.h. */
+-/* 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. */
--$ac_includes_default
--#include <$ac_header>
-+
++/* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
-+#endif
+ #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
--if { (ac_try="$ac_compile"
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
+- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -41353,140 +41366,191 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ libreplace_cv_sig_atomic_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ libreplace_cv_sig_atomic_t=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_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_compiler=no
fi
+-done
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+-for ac_func in strtol
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
++$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
++if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- 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 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
-+
+-/* 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. */
--#include <$ac_header>
-+
++/* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+#include <unistd.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
-+#endif
-+int
-+main ()
-+{
+ #endif
+-
+ int
+ main ()
+ {
+-return $ac_func ();
+int fd = open("/dev/null", O_DIRECT);
-+ ;
-+ return 0;
-+}
+ ;
+ return 0;
+ }
_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
+-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_cpp conftest.$ac_ext") 2>conftest.er1
+- (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); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- (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_header_preproc=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ libreplace_cv_HAVE_OPEN_O_DIRECT=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
-+
+
+-fi
+-done
+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
-- 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: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- ( cat <<\_ASBOX
--## ---------------------------------------- ##
--## Report this to samba-technical at samba.org ##
--## ---------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-for ac_func in strchr chflags
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
+$as_echo_n "checking that the C compiler understands volatile... " >&6; }
+if test "${libreplace_cv_volatile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+
+- 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. */
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
@@ -41502,32 +41566,36 @@
+ libreplace_cv_volatile=yes
+else
+ libreplace_cv_volatile=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: $libreplace_cv_volatile" >&5
+$as_echo "$libreplace_cv_volatile" >&6; }
+if test x"$libreplace_cv_volatile" = x"yes"; then
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
- 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
+-#undef $ac_func
++fi
-- 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
+-/* 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
+# filesys
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
@@ -41535,31 +41603,17 @@
+{ $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
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-l${termlib} $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
++/* end confdefs.h. */
+#include <sys/types.h>
+#include <$ac_hdr>
--/* 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 $ac_func ();
+if ((DIR *) 0)
+return 0;
;
@@ -41587,46 +41641,52 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_Lib=yes"
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$as_ac_Header=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_Lib=no"
+- eval "$as_ac_var=no"
+ eval "$as_ac_Header=no"
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--ac_res=`eval 'as_val=${'$as_ac_Lib'}
+-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_val=`eval 'as_val=${'$as_ac_Lib'}
+-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- TERMLIBS="-l${termlib}"; break
+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_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
+ _ACEOF
+
+ac_header_dirent=$ac_hdr; break
fi
+-done
+-
+-
-- 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
+-
+-
+-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
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
@@ -41635,9 +41695,7 @@
+if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMLIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
@@ -41645,18 +41703,42 @@
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
-@@ -39684,98 +9708,55 @@
+ Use char because int might match the return type of a GCC
+@@ -40135,104 +9452,56 @@
#ifdef __cplusplus
extern "C"
#endif
--char rl_callback_handler_install ();
+-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 opendir ();
int
main ()
{
--return rl_callback_handler_install ();
+-return $ac_func ();
+return opendir ();
;
return 0;
@@ -41683,12 +41765,17 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_readline_rl_callback_handler_install=yes
+- eval "$as_ac_var=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
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+for ac_lib in '' dir; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -41699,75 +41786,55 @@
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_opendir=$ac_res
fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then :
+ break
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
--$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
--if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
-- TERMLDFLAGS="-L$with_readline/lib"
-- TERMCPPFLAGS="-I$with_readline/include"
-- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-- TERMLIBS="-lreadline $TERMLIBS"
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBREADLINE 1
--_ACEOF
-+done
+ done
+if test "${ac_cv_search_opendir+set}" = set; then :
-- break
- else
-- TERMLIBS= CPPFLAGS=$_cppflags
++else
+ ac_cv_search_opendir=no
- fi
--
++fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
- fi
--
--done
--
--
-- LDFLAGS=$_ldflags
-- ;;
-- esac
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
++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"
- fi
++fi
-
-
-
--# The readline API changed slightly from readline3 to readline4, so
--# code will generate warnings on one of them unless we have a few
--# special cases.
--{ $as_echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
--$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
+-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
+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
--LIBS="-lreadline $TERMLIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
@@ -41775,18 +41842,42 @@
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
-@@ -39784,601 +9765,461 @@
+ Use char because int might match the return type of a GCC
+@@ -40240,170 +9509,148 @@
#ifdef __cplusplus
extern "C"
#endif
--char rl_completion_matches ();
+-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 opendir ();
int
main ()
{
--return rl_completion_matches ();
+-return $ac_func ();
+return opendir ();
;
return 0;
@@ -41813,7 +41904,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_readline_rl_completion_matches=yes
+- eval "$as_ac_var=yes"
+for ac_lib in '' x; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -41846,42 +41937,36 @@
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- ac_cv_lib_readline_rl_completion_matches=no
+- eval "$as_ac_var=no"
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
+for ac_header in 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
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
++
+ done
-+done
-
--# not all readline libs have rl_event_hook or history_list
--{ $as_echo "$as_me:$LINENO: checking whether rl_event_hook is declared" >&5
--$as_echo_n "checking whether rl_event_hook is declared... " >&6; }
--if test "${ac_cv_have_decl_rl_event_hook+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+for ac_header in sys/acl.h acl/libacl.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -41890,52 +41975,13 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <readline/readline.h>
++_ACEOF
--int
--main ()
--{
--#ifndef rl_event_hook
-- (void) rl_event_hook;
--#endif
+fi
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_have_decl_rl_event_hook=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+done
-- ac_cv_have_decl_rl_event_hook=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# select
+for ac_header in sys/select.h
+do :
@@ -41944,19 +41990,22 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SELECT_H 1
+_ACEOF
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
--$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; }
--if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 1
--_ACEOF
++fi
+
+done
+-for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+# time
+for ac_header in sys/time.h utime.h
+do :
@@ -41964,48 +42013,59 @@
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 0
++ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
-
- fi
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
+
+-#undef $ac_func
+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
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking 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
--LIBS="-lreadline $TERMLIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
++/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char history_list ();
int
main ()
{
--return history_list ();
+-return $ac_func ();
+if ((struct tm *) 0)
+return 0;
;
@@ -42033,14 +42093,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_readline_history_list=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_time=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_readline_history_list=no
+- eval "$as_ac_var=no"
+ ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -42054,48 +42114,70 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5
--$as_echo "$ac_cv_lib_readline_history_list" >&6; }
--if test "x$ac_cv_lib_readline_history_list" = x""yes; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_HISTORY_LIST 1
+-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 utime utimes
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+@@ -40412,426 +9659,311 @@
+ done
- fi
-+done
-
--###############################################
--# test for where we get yp_get_default_domain() from
--{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
--$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
--if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+-
+-
+-
+-
+-
+-
+-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
+# 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
-- ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -42106,15 +42188,20 @@
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
#endif
--char yp_get_default_domain ();
+-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 ()
{
--return yp_get_default_domain ();
+-return $ac_func ();
+ int s;
+ wait (&s);
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
@@ -42122,14 +42209,7 @@
return 0;
}
_ACEOF
--for ac_lib in '' nsl; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -42150,110 +42230,106 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_search_yp_get_default_domain=$ac_res
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_sys_wait_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_header_sys_wait_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+{ $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
- fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-- :
--else
-- ac_cv_search_yp_get_default_domain=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
--$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
--ac_res=$ac_cv_search_yp_get_default_domain
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+- 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
+
++
+# 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
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SYS_CAPABILITY_H 1
-+_ACEOF
+ _ACEOF
fi
+-done
+done
--for ac_func in yp_get_default_domain
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
+
+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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
++ $as_echo_n "(cached) " >&6
++else
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
++/* end confdefs.h. */
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+ #ifdef HAVE_SYS_CAPABILITY_H
+ #include <sys/capability.h>
+ #endif
-+
+
+int
+main ()
+{
-+
+
+ int i;
-+
+
+-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_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+ ;
+ return 0;
+}
-+_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_try_compile "$LINENO"; then :
+ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
+else
+ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
-+
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
@@ -42267,9 +42343,15 @@
-# include <assert.h>
-#endif
+$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
++
++fi
-#undef $ac_func
-+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
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42284,12 +42366,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
-+$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
-+if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
@@ -42388,20 +42464,54 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
--# Check if we have execl, if not we need to compile smbrun.
+fi
+done
--for ac_func in execl
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
++$as_echo_n "checking for getpwent_r declaration... " >&6; }
++if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++ #include <unistd.h>
++ #include <pwd.h>
+
++int
++main ()
++{
++int i = (int)getpwent_r
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_getpwent_r_decl=yes
++else
++ ac_cv_have_getpwent_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_getpwent_r_decl" >&5
++$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
++ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
+
++$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
+
+-for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$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 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 "$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
@@ -42409,25 +42519,29 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ $ac_includes_default
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++ #include <unistd.h>
++ #include <pwd.h>
-#undef $ac_func
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++ 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
@@ -42442,17 +42556,20 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #include <unistd.h>
-+ #include <pwd.h>
++ #ifndef HAVE_GETPWENT_R_DECL
++ #error missing getpwent_r prototype
++ #endif
++ return NULL;
++
++ }
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+int i = (int)getpwent_r
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42477,19 +42594,20 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_getpwent_r_decl=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"
-+ ac_cv_have_getpwent_r_decl=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"'`
@@ -42500,55 +42618,13 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5
-+$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
-+ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+{ $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 confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+ $ac_includes_default
-+
-+ #include <unistd.h>
-+ #include <pwd.h>
-+
-+ struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)
-+ {
-+
-+ #ifndef HAVE_GETPWENT_R_DECL
-+ #error missing getpwent_r prototype
-+ #endif
-+ return NULL;
-+
-+ }
-+
- _ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
+-_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-done
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
-
--if test x"$ac_cv_func_execl" = x"no"; then
-- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
--fi
-+else
-
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-+fi
+-
+-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__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 :
@@ -42559,7 +42635,7 @@
+fi
--for ac_func in getcwd fchown chmod fchmod mknod mknod64
+-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
@@ -42693,19 +42769,54 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -40387,242 +10228,210 @@
+@@ -40840,347 +9972,221 @@
done
--for ac_func in strtol
++ { $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
+
+-for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5
-+$as_echo_n "checking for getgrent_r declaration... " >&6; }
-+if test "${ac_cv_have_getgrent_r_decl+set}" = set; then :
++ fi
++
++{ $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
@@ -42713,25 +42824,29 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ $ac_includes_default
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++ #include <unistd.h>
++ #include <grp.h>
-#undef $ac_func
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++ struct group *getgrent_r(struct group *src, char *buf, int buflen)
++ {
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42746,17 +42861,20 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #include <unistd.h>
-+ #include <grp.h>
++ #ifndef HAVE_GETGRENT_R_DECL
++ #error missing getgrent_r prototype
++ #endif
++ return NULL;
++
++ }
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+int i = (int)getgrent_r
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42781,20 +42899,32 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_getgrent_r_decl=yes
++
++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
++
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ ac_cv_have_getgrent_r_decl=no
- fi
--
+-fi
++ 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
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
++$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
++if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
++
++
++$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -42804,68 +42934,18 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getgrent_r_decl" >&5
-+$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
-+ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
-+$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; }
-+if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+ $ac_includes_default
-+
-+ #include <unistd.h>
-+ #include <grp.h>
-+
-+ struct group *getgrent_r(struct group *src, char *buf, int buflen)
-+ {
-+
-+ #ifndef HAVE_GETGRENT_R_DECL
-+ #error missing getgrent_r prototype
-+ #endif
-+ return NULL;
-+
-+ }
-+
- _ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
-+
-+else
-+
-+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
+-_ACEOF
fi
-done
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
-+$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
-+if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
-+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
-
--for ac_func in strchr chflags
+-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
-+
-+fi
-+
-+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
+$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; }
+if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
@@ -42985,39 +43065,20 @@
+
+fi
+
-+
-+# locale
-+for ac_header in ctype.h locale.h
++for ac_func in getgrouplist
+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" "getgrouplist" "ac_cv_func_getgrouplist"
++if test "x$ac_cv_func_getgrouplist" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_GETGROUPLIST 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
-+
-+fi
-
-+done
-
-
--for ac_func in getrlimit fsync fdatasync setpgid
+-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
@@ -43027,8 +43088,8 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# shmem
-+for ac_header in sys/ipc.h sys/mman.h sys/shm.h
++# locale
++for ac_header in ctype.h locale.h langinfo.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"
@@ -43043,21 +43104,111 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++fi
+
+-#undef $ac_func
+done
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
++# glob
++for ac_header in fnmatch.h
++do :
++ 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
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++done
+
+
++# 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_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
++
+ done
+
+
+# terminal
+for ac_header in termios.h termio.h sys/termio.h
+do :
@@ -43068,13 +43219,39 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 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`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+save_LIBS="$LIBS"
+LIBS=""
@@ -43091,7 +43268,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40630,104 +10439,85 @@
+@@ -41188,102 +10194,85 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -43192,11 +43369,9 @@
_ACEOF
fi
--done
--
++
+ done
-+done
-
+for ac_func in dlopen dlsym dlerror dlclose
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -43213,7 +43388,7 @@
+done
--for ac_func in setsid glob strpbrk crypt16 getauthuid
+-for ac_func in syslog vsyslog timegm
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -43230,7 +43405,9 @@
-_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
@@ -43247,13 +43424,10 @@
-#endif
-
-#undef $ac_func
-+ 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
-@@ -40735,841 +10525,612 @@
+@@ -41291,966 +10280,612 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -43370,44 +43544,25 @@
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
+-
+-for ac_func in setlocale nl_langinfo
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++{ $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 >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
@@ -43416,21 +43571,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. */
-+ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no
++ $ac_includes_default
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ #include <dlfcn.h>
-#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 :
++ void *dlopen(const char* filename, unsigned int flags)
++ {
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43445,6 +43597,9 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++ return 0;
++
++ }
-int
-main ()
@@ -43453,7 +43608,7 @@
- ;
- return 0;
-}
--_ACEOF
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -43476,13 +43631,19 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
++
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
- eval "$as_ac_var=no"
--fi
++ 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
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -43498,48 +43659,26 @@
- 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_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 :
+
-+if test x"${libreplace_cv_dlfcn}" = x"yes";then
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
- fi
--done
-
-+LIBDL="$LIBS"
+
-+LIBS="$save_LIBS"
++$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 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
+ fi
+-done
-+if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
-+$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
-
-
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
-+else
-
--for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+-for ac_func in nanosleep
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking 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
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -43549,23 +43688,28 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
++if test x"${libreplace_cv_dlfcn}" = x"yes";then
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
++fi
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++LIBDL="$LIBS"
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++LIBS="$save_LIBS"
-#undef $ac_func
-+SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end 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
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43580,6 +43724,32 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
++if test "x$ac_cv_func_getpassphrase" = x""yes; then :
++ libreplace_cv_HAVE_GETPASSPHRASE=yes
++fi
++
++if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
++
++$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
++
++
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
++
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
++else
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
++$as_echo_n "checking whether getpass should be replaced... " >&6; }
++if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++SAVE_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
+#include "confdefs.h"
+#define NO_CONFIG_H
+#include "$libreplacedir/getpass.c"
@@ -43630,13 +43800,13 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
+$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
+if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
++
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-+
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43649,9 +43819,8 @@
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- fi
--done
-
++fi
++
+{ $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 :
@@ -43663,14 +43832,14 @@
+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
+ else
+ libreplace_cv_STRPTIME_OK=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -43682,22 +43851,14 @@
+{ $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"
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS $LIBS"
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/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_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
++
+for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -43706,52 +43867,38 @@
+ 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
++_ACEOF
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+fi
--#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
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
+- { $as_echo "$as_me:$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
+#######################################
+# Check for mkdir mode
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
+$as_echo_n "checking whether mkdir supports mode... " >&6; }
+if test "${libreplace_cv_mkdir_has_mode+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char nanosleep ();
+ #include <stdio.h>
+ #ifdef HAVE_DIRECT_H
+ #include <direct.h>
@@ -43759,7 +43906,7 @@
int
main ()
{
--return $ac_func ();
+-return nanosleep ();
+
+ mkdir("foo",0777);
+ return 0;
@@ -43789,65 +43936,75 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_lib_ext_rt_nanosleep=yes;
+- ac_cv_lib_ext_rt=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ libreplace_cv_mkdir_has_mode="yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
+- ac_cv_lib_ext_rt_nanosleep=no;
+- ac_cv_lib_ext_rt=no
+ libreplace_cv_mkdir_has_mode="no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+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; }
+
+if test "$libreplace_cv_mkdir_has_mode" = "yes"
+then
-+
-+$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
+
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
+-$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
+- if test $ac_cv_lib_ext_rt_nanosleep = yes; then
+
+for ac_func in timegm
+do :
+ ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
+if test "x$ac_cv_func_timegm" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_NANOSLEEP 1
+#define HAVE_TIMEGM 1
_ACEOF
+else
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} timegm.o"
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
fi
- done
++done
+-LIBS=$ac_check_lib_ext_save_LIBS
+-if test $ac_cv_lib_ext_rt = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
+$as_echo_n "checking for broken readdir... " >&6; }
+if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+- case "$LIBS" in
+- *-lrt*)
+- ;;
+- *)
+- LIBS="-lrt $LIBS"
+- ;;
+- esac
+ if test "$cross_compiling" = yes; then :
+ libreplace_cv_READDIR_NEEDED="assuming not"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
++
+#define test_readdir_os2_delete main
+#include "$libreplacedir/test/os2_delete.c"
+_ACEOF
@@ -43861,27 +44018,36 @@
+fi
-+fi
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
+$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
++
++for ac_func in dirfd
++do :
++ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
++if test "x$ac_cv_func_dirfd" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DIRFD 1
++_ACEOF
--for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
+ fi
+ done
+
+
+-for ac_func in utimensat
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
++$as_echo_n "checking for dirfd declaration... " >&6; }
++if test "${ac_cv_have_dirfd_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in dirfd
-+do :
-+ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
-+if test "x$ac_cv_func_dirfd" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DIRFD 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -43893,17 +44059,15 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
-+done
-
+-
-#undef $ac_func
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -43917,11 +44081,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ { $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. */
@@ -43964,12 +44123,13 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
++ 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
-+ ac_cv_have_dirfd_decl=no
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43981,15 +44141,12 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--done
--
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5
+$as_echo "$ac_cv_have_dirfd_decl" >&6; }
+ if test x"$ac_cv_have_dirfd_decl" = x"yes"; then
+-fi
+-done
+$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h
+ fi
@@ -44010,7 +44167,7 @@
+fi
+done
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-for ac_func in mlock munlock mlockall munlockall
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44126,7 +44283,6 @@
fi
-done
--
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
+$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
+if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
@@ -44135,15 +44291,15 @@
+$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
-+fi
-
-
--for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
+-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
++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 :
@@ -44228,30 +44384,108 @@
+
+ ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
+
-+else
-+
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
+-fi
+ ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=no
-+
-+fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
+
+ fi
+-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&5
+$as_echo "$ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&6; }
+if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
-+
-+
+
+
+-for ac_header in sys/mman.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
+
-+
-+fi
-+
+
+- ac_header_compiler=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+{ $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
-+
+
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ if test "$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;}
@@ -44259,49 +44493,105 @@
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-#include <$ac_header>
+
+#define _LIBREPLACE_REPLACE_H
+#include "$libreplacedir/repdir_getdirentries.c"
+#define test_readdir_os2_delete main
+#include "$libreplacedir/test/os2_delete.c"
-+_ACEOF
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_READDIR_GETDIRENTRIES=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+ 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
+ fi
-- eval "$as_ac_var=no"
-+
-+fi
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
+$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
- fi
++fi
+if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
+
+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
+
+
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
+
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
+ libreplace_cv_READDIR_NEEDED=no
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
+-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
+#
@@ -44313,15 +44603,18 @@
+ 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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_GETDENTS 1
_ACEOF
fi
+-
done
+-# setbuffer, shmget, shm_open are needed for smbtorture
-
--for ac_func in getpwent_r
+-
+-for ac_func in shmget shm_open
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44434,7 +44727,7 @@
- eval "$as_ac_var=no"
+$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
+
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
+ libreplace_cv_READDIR_NEEDED=no
fi
@@ -44473,10 +44766,11 @@
fi
-done
+-
+done
--for ac_func in getdents64
+-for ac_func in gettext dgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44516,7 +44810,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -41577,103 +11138,25 @@
+@@ -42258,101 +10893,25 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44589,9 +44883,7 @@
-
-
-
--
--
--for ac_func in setenv strcasecmp fcvt fcvtl
+-for ac_func in bindtextdomain textdomain
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44630,7 +44922,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -41681,1312 +11164,653 @@
+@@ -42360,1176 +10919,665 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44674,11 +44966,6 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_ext_crypt="-l$ac_lib"
+break
@@ -44686,22 +44973,43 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ done
- fi
++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"
++
++$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
++
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o"
++fi
++
++
++for ac_func in 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 :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+- eval "$as_ac_var=no"
++else
++ as_fn_error "Required function not found" "$LINENO" 5
+ fi
++done
+
-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
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44710,15 +45018,15 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
++echo "LIBREPLACE_BROKEN_CHECKS: END"
+
-+for ac_func in syslog printf memset memcpy
++for ac_func in syslog
+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" "syslog" "ac_cv_func_syslog"
++if test "x$ac_cv_func_syslog" = 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_SYSLOG 1
_ACEOF
+else
@@ -44727,10 +45035,7 @@
done
-+echo "LIBREPLACE_BROKEN_CHECKS: END"
-
-
--for ac_func in syslog vsyslog timegm
+-for ac_func in strupr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44740,52 +45045,14 @@
-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. */
+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
-- 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
++
+LIBREPLACE_NETWORK_OBJS=""
+LIBREPLACE_NETWORK_LIBS=""
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- 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`
@@ -44795,88 +45062,6 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_header in netinet/in_systm.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_NETINET_IN_SYSTM_H 1
- _ACEOF
-
- fi
--done
-
-+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 setlocale nl_langinfo
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -44898,14 +45083,12 @@
+done
-#undef $ac_func
-+for ac_header in netinet/tcp.h netinet/in_ip.h
++for ac_header in netinet/in_systm.h
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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" "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_header" | $as_tr_cpp` 1
++#define HAVE_NETINET_IN_SYSTM_H 1
+_ACEOF
-/* Override any GCC internal prototype to avoid an error.
@@ -44932,14 +45115,21 @@
-}
+done
+
-+for ac_header in sys/sockio.h sys/un.h
++for ac_header in netinet/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 :
++ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
++ #include <sys/types.h>
++ #ifdef HAVE_NETINET_IN_H
++ #include <netinet/in.h>
++ #endif
++ #ifdef HAVE_NETINET_IN_SYSTM_H
++ #include <netinet/in_systm.h>
++ #endif
++
++"
++if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_NETINET_IP_H 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -44973,7 +45163,19 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++done
++
++for ac_header in netinet/tcp.h netinet/in_ip.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44981,79 +45183,69 @@
-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/uio.h
++for ac_header in sys/sockio.h sys/un.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 :
++ 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_SYS_UIO_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
+
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 HAVE_SYS_UIO_H 1
++_ACEOF
--for ac_func in nanosleep
+-# Find a method of generating a stack trace
++fi
+
++done
+
+
+-for ac_header in execinfo.h libexc.h libunwind.h
-do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
else
-- cat >conftest.$ac_ext <<_ACEOF
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
+ /* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
++
+ $ac_includes_default
+ #if HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
@@ -45061,15 +45253,15 @@
+ #include <net/if.h>
+ int main(void) {return 0;}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -45078,11 +45270,8 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ libreplace_cv_USABLE_NET_IF_H=yes
else
@@ -45090,50 +45279,168 @@
-sed 's/^/| /' conftest.$ac_ext >&5
+ libreplace_cv_USABLE_NET_IF_H=no
-- eval "$as_ac_var=no"
+- ac_header_compiler=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; }
--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
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
-_ACEOF
--
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
-else
--
--
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+{ $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"
++
+$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
-+fi
+- ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
-
-- { $as_echo "$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
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++
+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
+- eval "$as_ac_Header=\$ac_header_preproc"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++$ac_includes_default
++#include <sys/socket.h>
++int
++main ()
++{
++socklen_t foo;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "ac_cv_type_$cv=yes"
++else
++ eval "ac_cv_type_$cv=no"
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++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
++
+
+ 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
++
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
+ _ACEOF
+
+ fi
+
+-done
+
+-# libexecinfo provides backtrace_symbols on FreeBSD
+-{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
+-$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
+-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
++
++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
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
@@ -45147,19 +45454,26 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char nanosleep ();
+-char backtrace_symbols ();
+$ac_includes_default
+#include <sys/socket.h>
int
main ()
{
--return nanosleep ();
-+socklen_t foo;
+-return backtrace_symbols ();
++sa_family_t foo;
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-for ac_lib in '' execinfo; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45180,70 +45494,56 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ext_rt_nanosleep=yes;
-- ac_cv_lib_ext_rt=yes
+- ac_cv_search_backtrace_symbols=$ac_res
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "ac_cv_type_$cv=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_ext_rt_nanosleep=no;
-- ac_cv_lib_ext_rt=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--
+ eval "ac_cv_type_$cv=no"
- fi
--{ $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
--
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
+ac_foo=`eval echo \\$ac_cv_type_$cv`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+$as_echo "$ac_foo" >&6; }
+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++ ac_tr_hdr=HAVE_`echo sa_family_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 :
++ 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 :
--LIBS=$ac_check_lib_ext_save_LIBS
--
--if test $ac_cv_lib_ext_rt = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRT 1
+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SOCKLEN_T 1
- _ACEOF
++#define HAVE_SA_FAMILY_T 1
++_ACEOF
-- case "$LIBS" in
-- *-lrt*)
-- ;;
-- *)
-- LIBS="-lrt $LIBS"
-- ;;
-- esac
--
+-fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+- break
fi
+-done
+-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+- :
+-else
+- ac_cv_search_backtrace_symbols=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
+-$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
+-ac_res=$ac_cv_search_backtrace_symbols
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
--done
--
-
--
--
--for ac_func in mlock munlock mlockall munlockall
+-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
@@ -45262,18 +45562,18 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
-#undef $ac_func
@@ -45290,23 +45590,22 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-+cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
-+$as_echo_n "checking for sa_family_t... " >&6; }
++cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
++$as_echo_n "checking for struct addrinfo... " >&6; }
+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+$ac_includes_default
-+#include <sys/socket.h>
++#include <netdb.h>
int
main ()
{
-return $ac_func ();
-+sa_family_t foo;
++struct addrinfo foo;
;
return 0;
}
@@ -45346,13 +45645,13 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+$as_echo "$ac_foo" >&6; }
+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++ ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+if false; then
-+ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
-+if test "x$ac_cv_type_sa_family_t" = x""yes; then :
++ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
++if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SA_FAMILY_T 1
++#define HAVE_STRUCT_ADDRINFO 1
+_ACEOF
+
@@ -45381,17 +45680,123 @@
-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
++
++cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
++$as_echo_n "checking for struct sockaddr... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lexc $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
--
--for ac_func in memalign posix_memalign hstrerror
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char trace_back_stack ();
++$ac_includes_default
++#include <sys/socket.h>
+ int
+ main ()
+ {
+-return trace_back_stack ();
++struct sockaddr foo;
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_exc_trace_back_stack=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "ac_cv_type_$cv=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ eval "ac_cv_type_$cv=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR 1
++_ACEOF
++
+
+- ac_cv_lib_exc_trace_back_stack=no
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
+-$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
+-if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBEXC 1
+-_ACEOF
+
+- LIBS="-lexc $LIBS"
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
++_ACEOF
+
+ fi
+
+
+-# check for sysctlbyname for BSD systems
+
+-for ac_func in sysctlbyname
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+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; }
++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
@@ -45416,9 +45821,10 @@
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
--
++$ac_includes_default
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -45432,14 +45838,15 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
-+$ac_includes_default
-+#include <netdb.h>
int
main ()
{
-return $ac_func ();
-+struct addrinfo foo;
++struct sockaddr_storage foo;
;
return 0;
}
@@ -45479,13 +45886,13 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+$as_echo "$ac_foo" >&6; }
+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++ ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+if false; then
-+ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
++ ac_fn_c_check_type "$LINENO" "struct sockaddr_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_ADDRINFO 1
++#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+_ACEOF
+
@@ -45514,17 +45921,19 @@
-done
--for ac_header in sys/mman.h
+-#############################
+-# check if building with gpfs
+
+-for ac_header in gpfs_gpl.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
-+$as_echo_n "checking for struct sockaddr... " >&6; }
++cv=`echo "struct sockaddr_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
-fi
@@ -45543,18 +45952,9 @@
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-+
- $ac_includes_default
+-$ac_includes_default
-#include <$ac_header>
-+#include <sys/socket.h>
-+int
-+main ()
-+{
-+struct sockaddr foo;
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -45574,28 +45974,20 @@
- 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
+-fi
++$ac_includes_default
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+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 :
++#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
@@ -45607,8 +45999,13 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR 1
++int
++main ()
++{
++struct sockaddr_in6 foo;
++ ;
++ return 0;
++}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -45628,12 +46025,29 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=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_preproc=no
--fi
++ 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
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -45695,69 +46109,73 @@
fi
-done
--
--# setbuffer, shmget, shm_open are needed for smbtorture
+-if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
++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>
--for ac_func in shmget shm_open
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+cv=`echo "struct 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
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GPFS 1
+-_ACEOF
++"
++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
++
++$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
+
+- default_shared_modules="$default_shared_modules vfs_gpfs"
+ fi
+
+-#############################################
+-# check if building on Isilon OneFS
+-printf "%s" "checking for Isilon OneFS... "
+-save_LIBS="$LIBS"
+-LIBS="$LIBS -lisi_version"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ 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
-+$ac_includes_default
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++
++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
++
++fi
++
++fi
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
++$as_echo_n "checking for sin_len in sock... " >&6; }
++if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <isi_version/isi_version.h>
++
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
int
main ()
{
--return $ac_func ();
-+struct sockaddr_storage foo;
+-get_isilon_copyright()
++
++struct sockaddr_in sock; sock.sin_len = sizeof(sock);
++
;
return 0;
}
@@ -45783,115 +46201,111 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
- else
+- samba_cv_HAVE_ONEFS=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
-+
++if ac_fn_c_try_compile "$LINENO"; then :
-- eval "$as_ac_var=no"
- fi
+- samba_cv_HAVE_ONEFS=no
+-fi
++ libreplace_cv_HAVE_SOCK_SIN_LEN=yes
-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
++else
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ONEFS 1
+-_ACEOF
++ libreplace_cv_HAVE_SOCK_SIN_LEN=no
+
+- default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
+- default_static_modules="$default_static_modules"
+- ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
+- # Need to also add general libs for oplocks support
+- save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
fi
--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
-+
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
- _ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-LIBS="$save_LIBS"
++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
+
+-# Note that all the libunwind symbols in the API are defined to internal
+-# platform-specific version, so we must include libunwind.h before checking
+-# any of them.
+-{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5
+-$as_echo_n "checking for libunwind... " >&6; }
+-save_LIBS=$LIBS
++$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
+
+-UNWIND_ARCH="unknown"
+-if test x"$UNAME_I" != x"unknown"; then
+- UNWIND_ARCH="$UNAME_I"
+-elif test x"$UNAME_M" != x"unknown"; then
+- UNWIND_ARCH="$UNAME_M"
+-elif test x"$UNAME_P" != x"unknown"; then
+- UNWIND_ARCH="$UNAME_P"
fi
--done
+-case "$UNWIND_ARCH" in
+- unknown)
+- # This probably won't link without
+- # the platform-specific libunwind.
+- LIBS="$LIBS -lunwind"
+- ;;
+- i386|i586|i686)
+- # Add the platform-specific libunwind module.
+- LIBS="$LIBS -lunwind -lunwind-x86"
+- ;;
+- *)
+- # Add the platform-specific libunwind module.
+- # based on uname -i, uname -m or uname -p
+- LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
+- ;;
+-esac
++############################################
++# 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
-
--for ac_func in gettext dgettext
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+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
+-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. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
+-#ifdef HAVE_LIBUNWIND_H
+-#include <libunwind.h>
-#endif
--
--#undef $ac_func
-+$ac_includes_default
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stddef.h>
+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
++#include <sys/un.h>
int
main ()
{
--return $ac_func ();
-+struct sockaddr_in6 foo;
+
+- unw_context_t ctx; unw_cursor_t cur;
+- char buf[256]; unw_word_t off;
+- unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
+- unw_get_proc_name(&cur, buf, sizeof(buf), &off);
++struct sockaddr_un sunaddr;
++sunaddr.sun_family = AF_UNIX;
+
;
return 0;
}
@@ -45917,68 +46331,22 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+-
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND 1
+-_ACEOF
+-
+if 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
+- # If we have libunwind, test whether we also have libunwind-ptrace
+- # which would let us unwind arbitrary processes.
+- save_LIBS=$LIBS
++ libreplace_cv_HAVE_UNIXSOCKET=yes
--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
-+
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
- _ACEOF
-
- fi
--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
+-for ac_header in libunwind-ptrace.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -45986,12 +46354,12 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -46029,16 +46397,13 @@
- ac_header_compiler=no
-fi
++ libreplace_cv_HAVE_UNIXSOCKET=no
--rm -f core conftest.err conftest.$ac_objext 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; }
-+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
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -46071,19 +46436,17 @@
-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 "$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
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+fi
-+fi
++$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -46118,13 +46481,10 @@
-{ $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 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
+- $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
@@ -46134,100 +46494,62 @@
-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 connect
++do :
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+ 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;
-+}
++#define HAVE_CONNECT 1
_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 "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
+- { $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_connect" = x"no"; then
+
-+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 :
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
++
++
++
++ { $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
-- ac_func_search_save_LIBS=$LIBS
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lunwind-ptrace $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char backtrace_symbols ();
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -43538,349 +11586,131 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char _UPT_create ();
++char connect ();
int
main ()
{
--return backtrace_symbols ();
-+
-+struct sockaddr_un sunaddr;
-+sunaddr.sun_family = AF_UNIX;
-+
+-return _UPT_create ();
++return connect ();
;
return 0;
}
_ACEOF
--for ac_lib in '' execinfo; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46248,134 +46570,114 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_search_backtrace_symbols=$ac_res
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ libreplace_cv_HAVE_UNIXSOCKET=yes
-+
+- ac_cv_lib_unwind_ptrace__UPT_create=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_nsl_s_connect=yes;
++ ac_cv_lib_ext_nsl_s=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-+ libreplace_cv_HAVE_UNIXSOCKET=no
-
+-
+- ac_cv_lib_unwind_ptrace__UPT_create=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_ext
++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
-- if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-- break
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
+-$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
+-if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
+-
+- LIBUNWIND_PTRACE="-lunwind-ptrace";
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND_PTRACE 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_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
+
+-
+-else
+- LIBUNWIND_PTRACE=""
-fi
--done
--if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-- :
+-
+-
+- LIBS=$save_LIBS
+-
-else
-- ac_cv_search_backtrace_symbols=no
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- LIBS=$save_LIBS
+-
fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5
-+$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
-+if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
-+
-+$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
-+
- fi
--{ $as_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"
-+
-+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 :
++LIBS=$ac_check_lib_ext_save_LIBS
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++if test $ac_cv_lib_ext_nsl_s = yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CONNECT 1
++#define HAVE_LIBNSL_S 1
+_ACEOF
- fi
-+done
+-# To use libunwind-ptrace, we also need to make some ptrace system calls.
+-if test x"$LIBUNWIND_PTRACE" != x"" ; then
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lnsl_s*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
-+if test x"$ac_cv_func_connect" = x"no"; then
-
--for ac_func in backtrace_symbols
+-for ac_header in sys/ptrace.h
-do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* 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_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef $ac_func
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
-+$as_echo_n "checking for connect in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_connect+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -42994,82 +11818,64 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
-+char connect ();
- int
- main ()
- {
--return $ac_func ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -46384,80 +46686,121 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_nsl_s_connect=yes;
-+ ac_cv_lib_ext_nsl_s=yes
- else
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_ext_nsl_s_connect=no;
-+ ac_cv_lib_ext_nsl_s=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-- eval "$as_ac_var=no"
+- ac_header_compiler=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
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_nsl_s = yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBNSL_S 1
- _ACEOF
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
-+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lnsl_s*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
-+
-+
- fi
--done
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
+- ac_header_preproc=no
+-fi
--{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
--$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
--if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
-+
-+
-+
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$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
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+- { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
+-$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
@@ -46465,17 +46808,28 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
-@@ -43078,93 +11884,65 @@
- #ifdef __cplusplus
- extern "C"
+-#if HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#if HAVE_SYS_PTRACE_H
+-#include <sys/ptrace.h>
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
#endif
--char trace_back_stack ();
+-
+char connect ();
int
main ()
{
--return trace_back_stack ();
+-
+- pid_t me = (pid_t)-1;
+- ptrace(PTRACE_ATTACH, me, 0, 0);
+- ptrace(PTRACE_DETACH, me, 0, 0);
+- return 0;
+-
+return connect ();
;
return 0;
@@ -46502,20 +46856,36 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_exc_trace_back_stack=yes
+-
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PTRACE 1
+-_ACEOF
+-
+-
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_nsl_connect=yes;
+ ac_cv_lib_ext_nsl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- LIBUNWIND_PTRACE=""
+-
+ ac_cv_lib_ext_nsl_connect=no;
+ ac_cv_lib_ext_nsl=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- ac_cv_lib_exc_trace_back_stack=no
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
+$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
@@ -46524,23 +46894,14 @@
+#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
--{ $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
++fi
+LIBS=$ac_check_lib_ext_save_LIBS
-+
+
+if test $ac_cv_lib_ext_nsl = yes; then :
- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBEXC 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL 1
- _ACEOF
++_ACEOF
-- LIBS="-lexc $LIBS"
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl*)
+ ;;
@@ -46548,23 +46909,22 @@
+ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-+
- fi
++fi
--# check for sysctlbyname for BSD systems
+
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
--for ac_func in sysctlbyname
+
+
+-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 -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
@@ -46596,7 +46956,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -43172,513 +11950,373 @@
+@@ -43888,106 +11718,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -46646,21 +47006,14 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_lib_ext_socket_connect=no;
+ ac_cv_lib_ext_socket=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- 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
@@ -46672,14 +47025,25 @@
-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_socket = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5
++$as_echo "$ac_cv_lib_ext_socket_connect" >&6; }
++ if test $ac_cv_lib_ext_socket_connect = yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBSOCKET 1
++#define HAVE_CONNECT 1
_ACEOF
+ fi
+-done
+-
+-
++LIBS=$ac_check_lib_ext_save_LIBS
+
++if test $ac_cv_lib_ext_socket = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBSOCKET 1
++_ACEOF
+
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lsocket*)
+ ;;
@@ -46687,45 +47051,70 @@
+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-+
-+
- fi
--done
--printf "%s" "checking for GPFS GPL libs... "
--save_LIBS="$LIBS"
--LIBS="$LIBS -lgpfs_gpl"
--cat >conftest.$ac_ext <<_ACEOF
++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_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
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS"
-+
-+
-+
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
+$as_echo_n "checking for connect in -linet... " >&6; }
+if test "${ac_cv_lib_ext_inet_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <gpfs_gpl.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
++/* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -43995,101 +11784,88 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+char connect ();
int
main ()
{
--gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)
+-return $ac_func ();
+return connect ();
;
return 0;
@@ -46752,7 +47141,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- samba_cv_HAVE_GPFS=yes
+- 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
@@ -46765,7 +47154,7 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- samba_cv_HAVE_GPFS=no
+- eval "$as_ac_var=no"
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5
+$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
@@ -46777,19 +47166,22 @@
-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_GPFS
--if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+LIBS=$ac_check_lib_ext_save_LIBS
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GPFS 1
++
+if test $ac_cv_lib_ext_inet = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBINET 1
_ACEOF
-- default_shared_modules="$default_shared_modules vfs_gpfs"
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-linet*)
+ ;;
@@ -46800,23 +47192,28 @@
+
+
fi
--LIBS="$save_LIBS"
+-done
+ 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. */
+$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
-+
+
+ fi
+fi
-+
+
+-for ac_func in __getcwd _getcwd
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+for ac_func in gethostbyname
+do :
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
@@ -46826,13 +47223,27 @@
_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
+
+if test x"$ac_cv_func_gethostbyname" = x"no"; then
-+
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
+
@@ -46844,20 +47255,27 @@
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <gpfs.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
++/* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -44097,102 +11873,65 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+char gethostbyname ();
int
main ()
{
--gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)
+-return $ac_func ();
+return gethostbyname ();
;
return 0;
@@ -46884,7 +47302,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- samba_cv_HAVE_GPFS=yes
+- 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
@@ -46897,7 +47315,7 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- samba_cv_HAVE_GPFS=no
+- eval "$as_ac_var=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; }
@@ -46909,19 +47327,22 @@
-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_GPFS
--if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+LIBS=$ac_check_lib_ext_save_LIBS
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GPFS 1
++
+if test $ac_cv_lib_ext_nsl_s = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBNSL_S 1
_ACEOF
-- default_shared_modules="$default_shared_modules vfs_gpfs"
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl_s*)
+ ;;
@@ -46932,44 +47353,68 @@
+
+
fi
--LIBS="$save_LIBS"
+-done
--#############################################
--# check if building on Isilon OneFS
--printf "%s" "checking for Isilon OneFS... "
--save_LIBS="$LIBS"
--LIBS="$LIBS -lisi_version"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
+
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
+
+
+-for ac_func in __xstat __fxstat __lxstat
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+
-+
-+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&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
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--#include <isi_version/isi_version.h>
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -44200,105 +11939,65 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+char gethostbyname ();
int
main ()
{
--get_isilon_copyright()
+-return $ac_func ();
+return gethostbyname ();
;
return 0;
@@ -46996,48 +47441,49 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- samba_cv_HAVE_ONEFS=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_nsl_gethostbyname=yes;
+ ac_cv_lib_ext_nsl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_lib_ext_nsl_gethostbyname=no;
+ ac_cv_lib_ext_nsl=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- samba_cv_HAVE_ONEFS=no
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $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
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETHOSTBYNAME 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
--echo $samba_cv_HAVE_ONEFS
--if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
-+fi
+ fi
+-done
+LIBS=$ac_check_lib_ext_save_LIBS
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ONEFS 1
++
+if test $ac_cv_lib_ext_nsl = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL 1
- _ACEOF
-
-- default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
-- default_static_modules="$default_static_modules"
-- ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
-- # Need to also add general libs for oplocks support
-- save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
++_ACEOF
++
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl*)
+ ;;
@@ -47045,79 +47491,70 @@
+ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-+
-+
- fi
--LIBS="$save_LIBS"
--# Note that all the libunwind symbols in the API are defined to internal
--# platform-specific version, so we must include libunwind.h before checking
--# any of them.
--{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5
--$as_echo_n "checking for libunwind... " >&6; }
--save_LIBS=$LIBS
++fi
+
+
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
--UNWIND_ARCH="unknown"
--if test x"$UNAME_I" != x"unknown"; then
-- UNWIND_ARCH="$UNAME_I"
--elif test x"$UNAME_M" != x"unknown"; then
-- UNWIND_ARCH="$UNAME_M"
--elif test x"$UNAME_P" != x"unknown"; then
-- UNWIND_ARCH="$UNAME_P"
--fi
--case "$UNWIND_ARCH" in
-- unknown)
-- # This probably won't link without
-- # the platform-specific libunwind.
-- LIBS="$LIBS -lunwind"
-- ;;
-- i386|i586|i686)
-- # Add the platform-specific libunwind module.
-- LIBS="$LIBS -lunwind -lunwind-x86"
-- ;;
-- *)
-- # Add the platform-specific libunwind module.
-- # based on uname -i, uname -m or uname -p
-- LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
-- ;;
--esac
--cat >conftest.$ac_ext <<_ACEOF
+-for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
++$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
++if test "${ac_cv_lib_ext_socket_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ { $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. */
+-/* 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
--#ifdef HAVE_LIBUNWIND_H
--#include <libunwind.h>
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -44306,107 +12005,87 @@
+ #ifdef __cplusplus
+ extern "C"
#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
-
+char gethostbyname ();
int
main ()
{
--
-- unw_context_t ctx; unw_cursor_t cur;
-- char buf[256]; unw_word_t off;
-- unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
-- unw_get_proc_name(&cur, buf, sizeof(buf), &off);
--
+-return $ac_func ();
+return gethostbyname ();
;
return 0;
@@ -47144,128 +47581,47 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
--
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND 1
--_ACEOF
--
--
-- # If we have libunwind, test whether we also have libunwind-ptrace
-- # which would let us unwind arbitrary processes.
-- save_LIBS=$LIBS
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_socket_gethostbyname=yes;
+ ac_cv_lib_ext_socket=yes
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 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
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
+- eval "$as_ac_var=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; }
--else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_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"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++_ACEOF
-- ac_header_compiler=no
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+LIBS=$ac_check_lib_ext_save_LIBS
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
++
+if test $ac_cv_lib_ext_socket = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBSOCKET 1
_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-- ac_header_preproc=no
--fi
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lsocket*)
+ ;;
@@ -47273,115 +47629,93 @@
+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- ( cat <<\_ASBOX
--## ---------------------------------------- ##
--## Report this to samba-technical at samba.org ##
--## ---------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- eval "$as_ac_Header=\$ac_header_preproc"
++
++
fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
+-done
+ if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
+ test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" ||
+ test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes"
+ then
+$as_echo "#define HAVE_GETHOSTBYNAME 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
-+
++fi
+
+for ac_func in if_nametoindex
+do :
+ ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
+if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_IF_NAMETOINDEX 1
- _ACEOF
++_ACEOF
- fi
--
- done
++fi
++done
-- { $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
--$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
--if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then
+if test x"$ac_cv_func_if_nametoindex" = x"no"; then
-+
-+
+
+
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
+
+
+-for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+
-+
-+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
--LIBS="-lunwind-ptrace $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
+ 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.
-@@ -43687,3344 +12325,2215 @@
+ Use char because int might match the return type of a GCC
+@@ -44414,2644 +12093,2283 @@
#ifdef __cplusplus
extern "C"
#endif
--char _UPT_create ();
+-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 if_nametoindex ();
int
main ()
{
--return _UPT_create ();
+-return $ac_func ();
+return if_nametoindex ();
;
return 0;
@@ -47408,7 +47742,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_unwind_ptrace__UPT_create=yes
+- 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
@@ -47416,7 +47750,7 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_unwind_ptrace__UPT_create=no
+- eval "$as_ac_var=no"
+ ac_cv_lib_ext_ipv6_if_nametoindex=no;
+ ac_cv_lib_ext_ipv6=no
fi
@@ -47426,28 +47760,30 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
--$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
--if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
+$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
+ if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_IF_NAMETOINDEX 1
-+_ACEOF
+ _ACEOF
-- LIBUNWIND_PTRACE="-lunwind-ptrace";
-+fi
+ fi
+-done
+LIBS=$ac_check_lib_ext_save_LIBS
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND_PTRACE 1
++
+if test $ac_cv_lib_ext_ipv6 = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBIPV6 1
- _ACEOF
++_ACEOF
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lipv6*)
@@ -47457,20 +47793,13 @@
+ ;;
+ esac
--else
-- LIBUNWIND_PTRACE=""
--fi
+fi
+ if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
+ then
-- LIBS=$save_LIBS
+$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
@@ -47480,63 +47809,78 @@
+libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir"
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- LIBS=$save_LIBS
+-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_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+for ac_func in socketpair
+do :
+ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
+if test "x$ac_cv_func_socketpair" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKETPAIR 1
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"
- fi
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/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
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
--for ac_header in sys/ptrace.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-#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
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
- else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
++ $as_echo_n "(cached) " >&6
++else
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_REPLACE_INET_NTOA=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
-+
++/* end confdefs.h. */
+
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
@@ -47549,15 +47893,15 @@
+ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
+exit(1);}
_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
+- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -47566,82 +47910,59 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_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
+- 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
fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-+fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ 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: $libreplace_cv_REPLACE_INET_NTOA" >&5
+$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
-
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
++
+for ac_func in inet_ntoa
+do :
+ ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
+if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_INET_NTOA 1
_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
-+
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+
++else
+ libreplace_cv_REPLACE_INET_NTOA=yes
-+fi
-+done
+ fi
+ done
-- ac_header_preproc=no
+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; }
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
++fi
+
+for ac_func in inet_aton
+do :
+ ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
@@ -47650,75 +47971,35 @@
+#define HAVE_INET_ATON 1
+_ACEOF
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- ( cat <<\_ASBOX
--## ---------------------------------------- ##
--## Report this to samba-technical at samba.org ##
--## ---------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
- else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} 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; }
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
++fi
+done
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+
+
+for ac_func in inet_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
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_INET_NTOP 1
- _ACEOF
++_ACEOF
-+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntop.o"
- fi
--
- done
-
-- { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
--$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
-- cat >conftest.$ac_ext <<_ACEOF
+-for ac_func in getdents __getdents _lseek __lseek _read __read
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
++fi
++done
+
++
+for ac_func in inet_pton
+do :
+ ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
@@ -47728,42 +48009,61 @@
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_pton.o"
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"
+fi
+done
-+
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+$as_echo_n "checking for getaddrinfo... " >&6; }
+if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-+
+
+-/* 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. */
++/* end confdefs.h. */
--#if HAVE_SYS_TYPES_H
- #include <sys/types.h>
++#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
- #endif
--#if HAVE_SYS_PTRACE_H
--#include <sys/ptrace.h>
--#endif
--
++#endif
+#include <sys/socket.h>
+#include <netdb.h>
int
main ()
{
-
-- pid_t me = (pid_t)-1;
-- ptrace(PTRACE_ATTACH, me, 0, 0);
-- ptrace(PTRACE_DETACH, me, 0, 0);
-- return 0;
+-return $ac_func ();
++
+struct sockaddr sa;
+struct addrinfo *ai = NULL;
+int ret = getaddrinfo(NULL, NULL, NULL, &ai);
@@ -47775,7 +48075,7 @@
+ NULL, 0,
+ NULL, 0, 0);
+
-
++
;
return 0;
}
@@ -47801,133 +48101,35 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
--
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_PTRACE 1
--_ACEOF
--
--
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ libreplace_cv_HAVE_GETADDRINFO=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- LIBUNWIND_PTRACE=""
--
+ libreplace_cv_HAVE_GETADDRINFO=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- fi
++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
+- eval "$as_ac_var=no"
+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
-
-
++
++
+$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
-
-
++
++
+$as_echo "#define HAVE_FREEADDRINFO 1" >>confdefs.h
-
-
++
++
+$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
-
--
--
--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_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getaddrinfo.o"
++
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
fi
-rm -rf conftest.dSYM
@@ -47966,20 +48168,14 @@
+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
-+fi
-
-
--for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
+-for ac_func in getdirentries _write __write _fork __fork
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: 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
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -47989,17 +48185,23 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
++fi
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
++$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
++if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
-#undef $ac_func
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -48071,13 +48273,25 @@
-
- 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
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -48088,50 +48302,7 @@
- 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_GETIFADDRS" >&5
-+$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
-+if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
-
--fi
--done
-+$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
-
-
-+$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
-
--for ac_func in __getcwd _getcwd
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
-
--#undef $ac_func
++
+##################
+# look for a method of finding the list of network interfaces
+iface=no;
@@ -48140,33 +48311,13 @@
+if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
++
+#define HAVE_IFACE_GETIFADDRS 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48178,153 +48329,41 @@
+#define getifaddrs_test main
+#include "$libreplacedir/test/getifaddrs.c"
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
++else
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++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
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++fi
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"
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
+fi
--for ac_func in __xstat __fxstat __lxstat
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++ $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. */
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
+#define HAVE_IFACE_AIX 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48339,55 +48378,45 @@
+_ACEOF
+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
--
-- eval "$as_ac_var=no"
++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
++fi
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++fi
+{ $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
--done
+fi
++fi
+-for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+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
@@ -48398,7 +48427,9 @@
+#include "$libreplacedir/getifaddrs.c"
+#define getifaddrs_test main
+#include "$libreplacedir/test/getifaddrs.c"
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_HAVE_IFACE_IFCONF=yes
+else
@@ -48407,34 +48438,23 @@
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
-
++
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
+$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
+if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_IFCONF 1" >>confdefs.h
-
++
+fi
+fi
-
--for ac_func in _stat _lstat _fstat __stat __lstat __fstat
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++
+if test $iface = no; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifreq" >&5
+$as_echo_n "checking for iface ifreq... " >&6; }
+if test "${libreplace_cv_HAVE_IFACE_IFREQ+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_IFREQ=cross
@@ -48564,8 +48584,11 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
--fi
+ libreplace_cv_HAVE_IPV6=no
++
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -48581,19 +48604,14 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
- fi
--done
--
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IPV6" >&5
+$as_echo "$libreplace_cv_HAVE_IPV6" >&6; }
+if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
-
++
+$as_echo "#define HAVE_IPV6 1" >>confdefs.h
-+fi
+ fi
+-done
+LIBS=$old_LIBS
+CPPFLAGS="$libreplace_SAVE_CPPFLAGS"
@@ -48605,7 +48623,11 @@
+CPPFLAGS="${SAVE_CPPFLAGS}"
--for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
+
++LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
+
+-for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -48622,16 +48644,12 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+LIBREPLACE_OBJS=""
-+for obj in ${LIBREPLACEOBJ}; do
-+ LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
-+done
++LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
-#ifdef __STDC__
-# include <limits.h>
@@ -48640,9 +48658,6 @@
-#endif
-#undef $ac_func
-+# add -ldl to the global LIBS
-+LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-+AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48657,6 +48672,9 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++# add -ldl to the global LIBS
++LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
++AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
-int
-main ()
@@ -48665,6 +48683,7 @@
- ;
- 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`
@@ -48706,14 +48725,6 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+done
+
+for ac_header in unistd.h grp.h sys/id.h memory.h alloca.h
@@ -48722,136 +48733,11 @@
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
--done
--
--
-
-+done
-
-+for ac_header in 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
-
-+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`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+for ac_header in 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
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef $ac_func
-+fi
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+done
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
-+for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--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
@@ -48859,9 +48745,10 @@
-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
++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"
@@ -48876,7 +48763,7 @@
+
done
-+for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
++for ac_header in 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"
@@ -48890,7 +48777,7 @@
+done
-+for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
++for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48904,7 +48791,7 @@
+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`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -48914,12 +48801,14 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/sysmacros.h
++for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SYSMACROS_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -48927,20 +48816,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. */
--
++fi
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++done
-#undef $ac_func
-+fi
++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
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48955,7 +48854,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+done
++fi
-int
-main ()
@@ -48964,7 +48863,9 @@
- ;
- return 0;
-}
-+for ac_header in sys/syslog.h syslog.h
++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"
@@ -49005,7 +48906,17 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++done
++
++for ac_header in sys/sysmacros.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_SYSMACROS_H 1
++_ACEOF
++
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -49013,9 +48924,10 @@
-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 langinfo.h locale.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"
@@ -49027,9 +48939,21 @@
_ACEOF
fi
--done
--
++
+ 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
+for ac_header in xfs/libxfs.h
@@ -49044,7 +48968,7 @@
+done
--for ac_func in getdirentries _write __write _fork __fork
+-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
@@ -49113,6 +49037,20 @@
+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
++
++fi
++
++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 HAVE_SYS_MODE_H 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -49157,21 +49095,6 @@
+done
+
+
-+## These fail to compile on IRIX so just check for their presence
-+for ac_header in sys/mode.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SYS_MODE_H 1
- _ACEOF
-
- fi
-+
- done
-
-
+# Look for Darwin headers
+old_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="-Iinclude $CPPFLAGS"
@@ -49182,23 +49105,29 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
+_ACEOF
-
++
+else
+ for ac_header in CFStringEncodingConverter.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
+if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
-+_ACEOF
+ _ACEOF
-+fi
+ fi
+-done
+done
+fi
--for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++done
+
++CPPFLAGS="$old_CPPFLAGS"
+
+-for ac_func in open64 _open64 __open64 creat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49208,40 +49137,38 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++# 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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+done
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+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
++fi
-#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
@@ -49256,9 +49183,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+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.
@@ -49310,24 +49235,11 @@
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test x"$ac_cv_header_shadow_h" = x"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 HAVE_SHADOW_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
@@ -49335,54 +49247,26 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++$as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h
+
-+done
-+
-+for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
++ fi
++ ;;
++esac
++for ac_header in shadow.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" "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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SHADOW_H 1
_ACEOF
fi
-+
- done
+-done
-+for ac_header in syscall.h sys/syscall.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
+done
-
-+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
-
-+fi
-
-+done
-
--for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+-for ac_func in prctl
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49392,7 +49276,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/ea.h sys/proplist.h
++for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49407,21 +49291,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. */
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
++done
-#undef $ac_func
-+done
++for ac_header in syscall.h sys/syscall.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -49436,6 +49329,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++fi
-int
-main ()
@@ -49444,7 +49338,10 @@
- ;
- return 0;
-}
-+for ac_header in sys/cdefs.h glob.h
++done
++
++
++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"
@@ -49495,9 +49392,7 @@
- if test "x$as_val" = x""yes; then
+done
+
-+
-+# For experimental utmp support (lastlog on some BSD-like systems)
-+for ac_header in utmp.h utmpx.h lastlog.h
++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"
@@ -49513,6 +49408,78 @@
done
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++for ac_header in sys/cdefs.h glob.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-#ifdef HAVE_SYS_PRCTL_H
+-#include <sys/prctl.h>
+-#endif
++fi
+
+-int
+-main ()
+-{
+-int i; i = prtcl(0);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++done
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PRCTL 1
++
++# 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
+
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+
++done
+
+-fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# 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]];'.
@@ -49524,7 +49491,27 @@
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-+else
+-#
+-#
+-#
+-case "$host_os" in
+- *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
+- # glibc <= 2.3.2 has a broken getgrouplist
+- if test "$cross_compiling" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+ 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;}
@@ -49535,22 +49522,53 @@
+ ac_cv_sizeof_int=0
+ fi
+fi
-
++
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+-#include <unistd.h>
+-#include <sys/utsname.h>
+-main() {
+- /* glibc up to 2.3 has a broken getgrouplist */
+-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+- int libc_major = __GLIBC__;
+- int libc_minor = __GLIBC_MINOR__;
+- if (libc_major < 2)
+- exit(1);
+- if ((libc_major == 2) && (libc_minor <= 3))
+- exit(1);
+-#endif
+- exit(0);
+-}
--for ac_func in pread _pread __pread pread64 _pread64 __pread64
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
-+_ACEOF
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- linux_getgrouplist_ok=yes
+
+
+# The cast to long int works around a bug in the HP C Compiler
@@ -49560,6 +49578,59 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
+- $as_echo "$as_me: 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 (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+
+-( exit $ac_status )
+-linux_getgrouplist_ok=no
++else
++ if test "$ac_cv_type_long" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$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
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+- if test x"$linux_getgrouplist_ok" = x"yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETGROUPLIST 1
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+
+- fi
+- ;;
+- *)
+
+-for ac_func in getgrouplist
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
++$as_echo_n "checking size of long long... " >&6; }
++if test "${ac_cv_sizeof_long_long+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -49571,21 +49642,21 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_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
-+ if test "$ac_cv_type_long" = yes; then
++ 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)
++as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+ else
-+ ac_cv_sizeof_long=0
++ ac_cv_sizeof_long_long=0
+ fi
+fi
@@ -49595,8 +49666,8 @@
-# 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; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
++$as_echo "$ac_cv_sizeof_long_long" >&6; }
-#undef $ac_func
@@ -49622,7 +49693,7 @@
- return 0;
-}
+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -49646,57 +49717,16 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=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
+-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"
-+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
+-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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-+$as_echo "$ac_cv_sizeof_long_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
- _ACEOF
-
-+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -49719,73 +49749,59 @@
+ ac_cv_sizeof_short=0
+ fi
fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+
+ fi
-done
-
-+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
+- ;;
+-esac
+-#
+-# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
+-#
+-if test x$ac_cv_func_stat64 = xno ; then
+- { $as_echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-
-
--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 defined(HAVE_UNISTD_H)
+-#include <unistd.h>
+-#endif
+-#include <sys/stat.h>
++
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++/* end confdefs.h. */
int
main ()
{
--return $ac_func ();
+-struct stat64 st64; exit(stat64(".",&st64));
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+ /* Ultrix mips cc rejects this. */
@@ -49861,41 +49877,30 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_func_stat64=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_const=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ ac_cv_c_const=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
-+
+
+$as_echo "#define const /**/" >>confdefs.h
fi
--done
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat64" >&5
+-$as_echo "$ac_cv_func_stat64" >&6; }
+- if test x$ac_cv_func_stat64 = xyes ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
@@ -49911,18 +49916,33 @@
+$ac_kw foo_t foo () {return 0; }
+#endif
-+_ACEOF
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STAT64 1
+ _ACEOF
+-
+- fi
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_inline=$ac_kw
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_inline" != no && break
+done
+-if test x$ac_cv_func_lstat64 = xno ; then
+- { $as_echo "$as_me:$LINENO: checking for lstat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+-#if defined(HAVE_UNISTD_H)
+-#include <unistd.h>
+case $ac_cv_c_inline in
+ inline | yes) ;;
+ *)
@@ -49933,51 +49953,60 @@
+ cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
-+#endif
-+_ACEOF
+ #endif
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-struct stat64 st64; exit(lstat64(".",&st64));
+- ;
+- return 0;
+-}
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+ ;;
-+esac
-
--for ac_func in open64 _open64 __open64 creat64
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_lstat64=yes
++
+ { $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
++ $as_echo_n "(cached) " >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 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
++/* end confdefs.h. */
+#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=
@@ -49999,7 +50028,7 @@
+ ac_prev=arch
+ fi
+ done
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
@@ -50008,7 +50037,18 @@
+#include <sys/types.h>
+ #include <sys/param.h>
--#undef $ac_func
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
+-$as_echo "$ac_cv_func_lstat64" >&6; }
+- if test x$ac_cv_func_lstat64 = xyes ; then
+- cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LSTAT64 Whether lstat64() is available
+-_ACEOF
+-
+- fi
+-fi
+int
+main ()
+{
@@ -50018,34 +50058,33 @@
+ bogus endian macros
+ #endif
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
+-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. */
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-
+-#if defined(HAVE_UNISTD_H)
+-#include <unistd.h>
+-#endif
+-#include <sys/stat.h>
+#include <sys/types.h>
+ #include <sys/param.h>
int
main ()
{
--return $ac_func ();
+-struct stat64 st64; exit(fstat64(0,&st64));
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+ #endif
@@ -50075,106 +50114,111 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_func_fstat64=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
--fi
-
++ ac_cv_c_bigendian=no
+ fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ ac_cv_c_bigendian=no
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
+-$as_echo "$ac_cv_func_fstat64" >&6; }
+- if test x$ac_cv_func_fstat64 = xyes ; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FSTAT64 1
-_ACEOF
-
+- fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--done
+-
+-#################################################
+-# Check whether struct stat has timestamps with sub-second resolution.
+-#
+-
+-samba_cv_stat_hires=no
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-$ac_includes_default
+#include <limits.h>
-
-+int
-+main ()
-+{
++
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (ac_aggr.st_mtim.tv_nsec)
+-return 0;
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+ bogus endian macros
+ #endif
-
--for ac_func in prctl
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
-else
-- cat >conftest.$ac_ext <<_ACEOF
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to _BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
+-$ac_includes_default
+#include <limits.h>
-
++
int
main ()
{
--return $ac_func ();
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_mtim.tv_nsec)
+-return 0;
+#ifndef _BIG_ENDIAN
+ not big endian
+ #endif
@@ -50183,15 +50227,15 @@
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -50200,47 +50244,45 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
+- } && test -s conftest.$ac_objext; then
+- ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+- ac_cv_member_struct_stat_st_mtim_tv_nsec=no
+ ac_cv_c_bigendian=no
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--done
-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then
-
--cat >conftest.$ac_ext <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
+-_ACEOF
+-
+-# Linux, Solaris
+- samba_cv_stat_hires=yes
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
+-$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # Compile a test program.
@@ -50248,10 +50290,7 @@
+ # Try to guess by grepping values from an object file.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--
--#ifdef HAVE_SYS_PRCTL_H
--#include <sys/prctl.h>
--#endif
+-$ac_includes_default
+short int ascii_mm[] =
+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ short int ascii_ii[] =
@@ -50267,11 +50306,13 @@
+ return ebcdic_mm[i] + ebcdic_ii[i];
+ }
+ extern int foo;
-
++
int
main ()
{
--int i; i = prtcl(0);
+-static struct stat ac_aggr;
+-if (ac_aggr.st_mtimensec)
+-return 0;
+return use_ascii (foo) == use_ebcdic (foo);
;
return 0;
@@ -50295,16 +50336,7 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PRCTL 1
--_ACEOF
--
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
+- ac_cv_member_struct_stat_st_mtimensec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ ac_cv_c_bigendian=yes
@@ -50317,44 +50349,27 @@
+ ac_cv_c_bigendian=unknown
+ fi
+ fi
- fi
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--#
--#
--#
--case "$host_os" in
-- *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-- # glibc <= 2.3.2 has a broken getgrouplist
-- if test "$cross_compiling" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
- else
-- cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-
--#include <unistd.h>
--#include <sys/utsname.h>
--main() {
-- /* glibc up to 2.3 has a broken getgrouplist */
--#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-- int libc_major = __GLIBC__;
-- int libc_minor = __GLIBC_MINOR__;
+ $ac_includes_default
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_mtimensec)
+-return 0;
++
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
@@ -50363,60 +50378,51 @@
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 1;
-
-- if (libc_major < 2)
-- exit(1);
-- if ((libc_major == 2) && (libc_minor <= 3))
-- exit(1);
--#endif
-- exit(0);
-+ ;
-+ return 0;
++
+ ;
+ return 0;
}
--
_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- linux_getgrouplist_ok=yes
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_member_struct_stat_st_mtimensec=yes
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_bigendian=no
else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
+- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--( exit $ac_status )
--linux_getgrouplist_ok=no
+- ac_cv_member_struct_stat_st_mtimensec=no
+ 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
+-
+-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
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtimensec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then
+{ $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 #(
@@ -50427,28 +50433,23 @@
+ ;; #(
+ universal)
-- if test x"$linux_getgrouplist_ok" = x"yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETGROUPLIST 1
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
-_ACEOF
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-- fi
-- ;;
-- *)
+-# BSD, if defined _POSIX_SOURCE
+- samba_cv_stat_hires=yes
+-fi
+ ;; #(
+ *)
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
--for ac_func in getgrouplist
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_mtimespec.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
+$as_echo_n "checking whether char is unsigned... " >&6; }
+if test "${ac_cv_c_char_unsigned+set}" = set; then :
@@ -50461,42 +50462,13 @@
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
-+$ac_includes_default
+ $ac_includes_default
int
main ()
{
--return $ac_func ();
+-static struct stat ac_aggr;
+-if (ac_aggr.st_mtimespec.tv_nsec)
+-return 0;
+static int test_array [1 - 2 * !(((char) -1) < 0)];
+test_array [0] = 0
+
@@ -50504,15 +50476,15 @@
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -50521,59 +50493,30 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
+- } && test -s conftest.$ac_objext; then
+- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_char_unsigned=no
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ ac_cv_c_char_unsigned=yes
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_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
-
-- ;;
--esac
--
--#
--# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
--#
-
--if test x$ac_cv_func_stat64 = xno ; then
-- { $as_echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
--$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
-- cat >conftest.$ac_ext <<_ACEOF
+- 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 :
@@ -50581,32 +50524,30 @@
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--
--#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <sys/stat.h>
+-$ac_includes_default
+#include <sys/types.h>
+#include <signal.h>
-
++
int
main ()
{
--struct stat64 st64; exit(stat64(".",&st64));
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_mtimespec.tv_nsec)
+-return 0;
+return *(signal (0, 0)) (0) == 1;
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -50615,11 +50556,8 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_stat64=yes
+- } && test -s conftest.$ac_objext; then
+- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_type_signal=int
else
@@ -50631,19 +50569,12 @@
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
-
++
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
-
--fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat64" >&5
--$as_echo "$ac_cv_func_stat64" >&6; }
-- if test x$ac_cv_func_stat64 = xyes ; then
++
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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 :
@@ -50653,143 +50584,94 @@
+/* end confdefs.h. */
+#include <sys/types.h>
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT64 1
- _ACEOF
+- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
++_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "uid_t" >/dev/null 2>&1; then :
+ ac_cv_type_uid_t=yes
+else
+ ac_cv_type_uid_t=no
-+fi
+ fi
+rm -f conftest*
-- 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
-
--if test x$ac_cv_func_lstat64 = xno ; then
-- { $as_echo "$as_me:$LINENO: checking for lstat64 in <sys/stat.h>" >&5
--$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
+$as_echo "#define uid_t int" >>confdefs.h
++
++
++$as_echo "#define gid_t int" >>confdefs.h
--#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <sys/stat.h>
-
--int
--main ()
--{
--struct stat64 st64; exit(lstat64(".",&st64));
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_lstat64=yes
-+$as_echo "#define gid_t int" >>confdefs.h
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
+
-+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 :
+
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
-+cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
+#define mode_t int
-+_ACEOF
+ _ACEOF
+-# BSD, if not defined _POSIX_SOURCE
+- samba_cv_stat_hires=yes
fi
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
--$as_echo "$ac_cv_func_lstat64" >&6; }
-- if test x$ac_cv_func_lstat64 = xyes ; then
-- cat >>confdefs.h <<\_ACEOF
--#define HAVE_LSTAT64 Whether lstat64() is available
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
+-$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
+- $as_echo_n "(cached) " >&6
+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
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+
+cat >>confdefs.h <<_ACEOF
+#define off_t long int
_ACEOF
-
-- fi
- fi
-
--if test x$ac_cv_func_fstat64 = xno ; then
-- { $as_echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
--$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+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 defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <sys/stat.h>
-+else
-
+-$ac_includes_default
-int
-main ()
-{
--struct stat64 st64; exit(fstat64(0,&st64));
+-static struct stat ac_aggr;
+-if (ac_aggr.st_mtime_n)
+-return 0;
- ;
- return 0;
-}
++
++fi
++
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
++
++else
++
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -50798,11 +50680,8 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_fstat64=yes
+- } && test -s conftest.$ac_objext; then
+- ac_cv_member_struct_stat_st_mtime_n=yes
+
+fi
+
@@ -50813,94 +50692,38 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
-
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
--$as_echo "$ac_cv_func_fstat64" >&6; }
-- if test x$ac_cv_func_fstat64 = xyes ; then
++
++fi
++
+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FSTAT64 1
++
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_RDEV 1
_ACEOF
-
-- fi
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+
++
+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
+
- fi
-
--#################################################
--# Check whether struct stat has timestamps with sub-second resolution.
--#
-
--samba_cv_stat_hires=no
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
--$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
++fi
++
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_off in dirent" >&5
+$as_echo_n "checking for d_off in dirent... " >&6; }
+if test "${ac_cv_dirent_d_off+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (ac_aggr.st_mtim.tv_nsec)
--return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
++
+#include <unistd.h>
+#include <sys/types.h>
+#include <dirent.h>
@@ -50908,7 +50731,7 @@
main ()
{
-static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtim.tv_nsec)
+-if (sizeof ac_aggr.st_mtime_n)
-return 0;
+struct dirent d; d.d_off;
;
@@ -50933,14 +50756,14 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
+- ac_cv_member_struct_stat_st_mtime_n=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_dirent_d_off=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_mtim_tv_nsec=no
+- ac_cv_member_struct_stat_st_mtime_n=no
+ ac_cv_dirent_d_off=no
fi
-
@@ -50954,9 +50777,9 @@
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then
+
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = x""yes; then :
@@ -50964,62 +50787,23 @@
+else
cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
+-#define HAVE_STRUCT_STAT_ST_MTIME_N 1
+#define ssize_t int
_ACEOF
--# Linux, Solaris
+-# AIX
- samba_cv_stat_hires=yes
fi
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
--$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_umtime" >&5
+-$as_echo_n "checking for struct stat.st_umtime... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (ac_aggr.st_mtimensec)
--return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtimensec=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+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 :
-
-- cat >conftest.$ac_ext <<_ACEOF
++
+ else
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
@@ -51030,97 +50814,41 @@
-main ()
-{
-static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtimensec)
+-if (ac_aggr.st_umtime)
-return 0;
- ;
- return 0;
-}
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define wchar_t unsigned short
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtimensec=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_mtimensec=no
--fi
-+cat >>confdefs.h <<_ACEOF
-+#define wchar_t unsigned short
-+_ACEOF
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $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
--#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
--_ACEOF
++
++fi
++
++
+############################################
+# for cups support we need libcups, and a handful of header files
-
--# BSD, if defined _POSIX_SOURCE
-- samba_cv_stat_hires=yes
++
+# Check whether --enable-cups was given.
+if test "${enable_cups+set}" = set; then :
+ enableval=$enable_cups;
- 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
++fi
+
++
+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
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (ac_aggr.st_mtimespec.tv_nsec)
--return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
++ $as_echo_n "(cached) " >&6
++else
+ case $CUPS_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path.
@@ -51155,7 +50883,7 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+- ac_cv_member_struct_stat_st_umtime=yes
+fi
+CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
+if test -n "$CUPS_CONFIG"; then
@@ -51167,25 +50895,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
++
++
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtimespec.tv_nsec)
--return 0;
-- ;
-- return 0;
--}
-+
-+
+ if test "x$CUPS_CONFIG" != x; then
+
+ ac_save_CFLAGS=$CFLAGS
@@ -51193,7 +50907,7 @@
+ ac_save_PRINT_LIBS=$PRINT_LIBS
+ CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
+ LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-+ PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
++ PRINT_LIBS="$PRINT_LIBS -lcups"
+ for ac_header in cups/cups.h cups/language.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -51203,6 +50917,53 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++fi
++
++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
++
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lcups $PRINT_LIBS $LIBS"
++
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for httpConnectEncrypt in -lcups" >&5
++$as_echo_n "checking for httpConnectEncrypt in -lcups... " >&6; }
++if test "${ac_cv_lib_ext_cups_httpConnectEncrypt+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char httpConnectEncrypt ();
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_umtime)
+-return 0;
++return httpConnectEncrypt ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -51221,24 +50982,48 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
--else
+- ac_cv_member_struct_stat_st_umtime=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_cups_httpConnectEncrypt=yes;
++ ac_cv_lib_ext_cups=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
--fi
++ ac_cv_lib_ext_cups_httpConnectEncrypt=no;
++ ac_cv_lib_ext_cups=no
+fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
-+done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
++$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
++ if test $ac_cv_lib_ext_cups_httpConnectEncrypt = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_HTTPCONNECTENCRYPT 1
++_ACEOF
+
-+ if test x"$ac_cv_header_cups_cups_h" = xyes -a \
-+ x"$ac_cv_header_cups_language_h" = xyes; then
++fi
++LIBS=$ac_check_lib_ext_save_LIBS
++
++if test $ac_cv_lib_ext_cups = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBCUPS 1
++_ACEOF
++
++ case "$PRINT_LIBS" in
++ *-lcups*)
++ ;;
++ *)
++ PRINT_LIBS="-lcups $PRINT_LIBS"
++ ;;
++ esac
+- ac_cv_member_struct_stat_st_umtime=no
+-fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+$as_echo "#define HAVE_CUPS 1" >>confdefs.h
-+
-+ samba_cv_HAVE_CUPS=yes
+ fi
+ 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;}
@@ -51246,40 +51031,46 @@
+ LDFLAGS=$ac_save_LDFLAGS
+ PRINT_LIBS=$ac_save_PRINT_LIBS
+ fi
-+
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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:$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
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Tru64
+- samba_cv_stat_hires=yes
+# 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_mtimespec_tv_nsec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
--_ACEOF
--# BSD, if not defined _POSIX_SOURCE
-- samba_cv_stat_hires=yes
+-if test x"$samba_cv_stat_hires" = x"yes" ; then
+if test x$enable_iprint != xno; then
+ if test x"$samba_cv_HAVE_CUPS" = xyes; then
-+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STAT_HIRES_TIMESTAMPS 1
+-_ACEOF
+$as_echo "#define HAVE_IPRINT 1" >>confdefs.h
-+
+
+ elif test x"$enable_iprint" = x"yes"; then
+ as_fn_error "iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
+ fi
fi
--{ $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
+-# 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
+############################################
+# 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
@@ -51302,7 +51093,7 @@
main ()
{
-static struct stat ac_aggr;
--if (ac_aggr.st_mtime_n)
+-if (ac_aggr.st_birthtimespec.tv_nsec)
-return 0;
+
+ if (0) {
@@ -51334,7 +51125,7 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtime_n=yes
+- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ samba_cv_optimize_out_funcation_calls=yes
else
@@ -51379,7 +51170,7 @@
main ()
{
-static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtime_n)
+-if (sizeof ac_aggr.st_birthtimespec.tv_nsec)
-return 0;
+
+ struct msghdr msg;
@@ -51412,14 +51203,14 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_mtime_n=yes
+- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_msghdr_msg_control=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_mtime_n=no
+- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -51428,25 +51219,24 @@
-
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:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
+-_ACEOF
+{ $as_echo "$as_me:${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
--_ACEOF
+$as_echo "#define HAVE_MSGHDR_MSG_CONTROL 1" >>confdefs.h
--# AIX
-- samba_cv_stat_hires=yes
fi
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_umtime" >&5
--$as_echo_n "checking for struct stat.st_umtime... " >&6; }
--if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
+-{ $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
+#############################################
+# check for fd passing struct via msg_acctrights
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_acctrights" >&5
@@ -51465,7 +51255,7 @@
-main ()
-{
-static struct stat ac_aggr;
--if (ac_aggr.st_umtime)
+-if (ac_aggr.st_birthtime)
-return 0;
- ;
- return 0;
@@ -51489,7 +51279,7 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_umtime=yes
+- ac_cv_member_struct_stat_st_birthtime=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -51512,7 +51302,7 @@
main ()
{
-static struct stat ac_aggr;
--if (sizeof ac_aggr.st_umtime)
+-if (sizeof ac_aggr.st_birthtime)
-return 0;
+
+ struct msghdr msg;
@@ -51542,14 +51332,14 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_umtime=yes
+- ac_cv_member_struct_stat_st_birthtime=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_msghdr_msg_acctrights=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_umtime=no
+- ac_cv_member_struct_stat_st_birthtime=no
+ samba_cv_msghdr_msg_acctrights=no
fi
-
@@ -51563,12 +51353,12 @@
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_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
+-{ $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
-cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_UMTIME 1
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+for ac_func in dirfd
+do :
+ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
@@ -51577,26 +51367,16 @@
+#define HAVE_DIRFD 1
_ACEOF
--# Tru64
-- samba_cv_stat_hires=yes
- 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
++fi
+done
-
--
--if test x"$samba_cv_stat_hires" = x"yes" ; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT_HIRES_TIMESTAMPS 1
--_ACEOF
--
++
+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
++fi
++
+{ $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 :
@@ -51613,7 +51393,7 @@
-main ()
-{
-static struct stat ac_aggr;
--if (ac_aggr.st_birthtimespec.tv_nsec)
+-if (ac_aggr.st_birthtimensec)
-return 0;
- ;
- return 0;
@@ -51637,7 +51417,7 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+- ac_cv_member_struct_stat_st_birthtimensec=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -51661,7 +51441,7 @@
main ()
{
-static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtimespec.tv_nsec)
+-if (sizeof ac_aggr.st_birthtimensec)
-return 0;
+struct sigevent s;
;
@@ -51686,14 +51466,14 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+- ac_cv_member_struct_stat_st_birthtimensec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_struct_sigevent=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=no
+- ac_cv_member_struct_stat_st_birthtimensec=no
+ samba_cv_struct_sigevent=no
fi
-
@@ -51702,38 +51482,40 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_sigevent" >&5
+$as_echo "$samba_cv_struct_sigevent" >&6; }
+if test x"$samba_cv_struct_sigevent" = x"yes"; then
-+
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimensec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_birthtimensec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then
+$as_echo "#define HAVE_STRUCT_SIGEVENT 1" >>confdefs.h
+
+ ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sival_ptr" "ac_cv_member_struct_sigevent_sigev_value_sival_ptr" "#include <signal.h>
+"
+if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
+#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
-+_ACEOF
-+
+ _ACEOF
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_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
+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
+-fi
++cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
- _ACEOF
++_ACEOF
- fi
++fi
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtime" >&5
--$as_echo_n "checking for struct stat.st_birthtime... " >&6; }
--if test "${ac_cv_member_struct_stat_st_birthtime+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking whether there is DOS flags support in the stat struct" >&5
+-$as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
+-if test "${samba_cv_stat_dos_flags+set}" = set; then
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec type" >&5
@@ -51741,45 +51523,6 @@
+if test "${samba_cv_struct_timespec+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (ac_aggr.st_birthtime)
--return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_birthtime=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -51788,7 +51531,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--$ac_includes_default
+-#include <sys/stat.h>
+
+#include <sys/types.h>
+#if STDC_HEADERS
@@ -51809,9 +51552,14 @@
int
main ()
{
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtime)
--return 0;
+-
+- int a = UF_DOS_ARCHIVE;
+- int h = UF_DOS_HIDDEN;
+- int r = UF_DOS_RO;
+- int s = UF_DOS_SYSTEM;
+- int i = UF_DOS_NOINDEX;
+- int f = UF_DOS_FLAGS;
+-
+struct timespec ts;
;
return 0;
@@ -51835,38 +51583,41 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_birthtime=yes
+- samba_cv_stat_dos_flags=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
-
-- ac_cv_member_struct_stat_st_birthtime=no
+- samba_cv_stat_dos_flags=no
+ samba_cv_struct_timespec=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_dos_flags" >&5
+-$as_echo "$samba_cv_stat_dos_flags" >&6; }
+-
+-if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_timespec" >&5
+$as_echo "$samba_cv_struct_timespec" >&6; }
+if test x"$samba_cv_struct_timespec" = x"yes"; then
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtime" >&5
--$as_echo "$ac_cv_member_struct_stat_st_birthtime" >&6; }
--if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STAT_DOS_FLAGS 1
+-_ACEOF
+$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
--_ACEOF
-+fi
+ 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
+-#####################################
+-# needed for SRV lookups
+-
+-{ $as_echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
+-$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
+# 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
@@ -51874,78 +51625,46 @@
+if test "${samba_cv_have_setresuid+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--$ac_includes_default
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dn_expand ();
-int
-main ()
-{
--static struct stat ac_aggr;
--if (ac_aggr.st_birthtimensec)
--return 0;
+-return dn_expand ();
- ;
- return 0;
-}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_birthtimensec=yes
--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 test "$cross_compiling" = yes; then :
+ samba_cv_have_setresuid=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtimensec)
--return 0;
-- ;
-- return 0;
--}
++/* end confdefs.h. */
+#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"
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
+- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -51954,47 +51673,78 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_member_struct_stat_st_birthtimensec=yes
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_resolv_dn_expand=yes
+if ac_fn_c_try_run "$LINENO"; then :
+ samba_cv_have_setresuid=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_birthtimensec=no
+- ac_cv_lib_resolv_dn_expand=no
+ samba_cv_have_setresuid=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
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_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:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresuid" >&5
+$as_echo "$samba_cv_have_setresuid" >&6; }
+if test x"$samba_cv_have_setresuid" = x"yes"; then
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
--_ACEOF
+- LIBS="-lresolv $LIBS"
+$as_echo "#define HAVE_SETRESUID 1" >>confdefs.h
-+fi
-+
+ 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
+# 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
+ $as_echo_n "(cached) " >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char _dn_expand ();
+-int
+-main ()
+-{
+-return _dn_expand ();
+- ;
+- return 0;
+-}
+ if test "$cross_compiling" = yes; then :
+ samba_cv_have_setresgid=cross
+else
@@ -52003,35 +51753,74 @@
+#include <unistd.h>
+#include <errno.h>
+main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_resolv__dn_expand=yes
+if ac_fn_c_try_run "$LINENO"; then :
+ samba_cv_have_setresgid=yes
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_resolv__dn_expand=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 -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresgid" >&5
+$as_echo "$samba_cv_have_setresgid" >&6; }
+if test x"$samba_cv_have_setresgid" = x"yes"; then
+- LIBS="-lresolv $LIBS"
+$as_echo "#define HAVE_SETRESGID 1" >>confdefs.h
-+fi
+ 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 "$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 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
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
@@ -52041,18 +51830,20 @@
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--#include <sys/stat.h>
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char __dn_expand ();
+$ac_includes_default
int
main ()
{
-
-- int a = UF_DOS_ARCHIVE;
-- int h = UF_DOS_HIDDEN;
-- int r = UF_DOS_RO;
-- int s = UF_DOS_SYSTEM;
-- int i = UF_DOS_NOINDEX;
-- int f = UF_DOS_FLAGS;
+-return __dn_expand ();
++
+ /* 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)
@@ -52076,20 +51867,20 @@
+ }
+ return 0;
+ }
-
++
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
+- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -52098,26 +51889,35 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- samba_cv_stat_dos_flags=yes
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_resolv___dn_expand=yes
+if ac_fn_c_try_run "$LINENO"; then :
+ 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
+- ac_cv_lib_resolv___dn_expand=no
+ ac_cv_func_memcmp_working=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_dos_flags" >&5
--$as_echo "$samba_cv_stat_dos_flags" >&6; }
+-{ $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: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
@@ -52126,57 +51926,30 @@
+ ;;
+esac
--if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
+- LIBS="-lresolv $LIBS"
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT_DOS_FLAGS 1
--_ACEOF
+-fi
--fi
+###############################################
+# Readline included by default unless explicitly asked not to
+test "${with_readline+set}" != "set" && with_readline=yes
-
--#####################################
--# needed for SRV lookups
++
+# 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; }
--{ $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_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. */
+-#
+-# Check for the functions putprpwnam, set_auth_parameters,
+-# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
+-# Needed for OSF1 and HPUX.
+-#
+# 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; }
-
--/* 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;
--}
++
+ 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`
@@ -52185,65 +51958,50 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_resolv_dn_expand=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++_ACEOF
-- 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
--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
+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_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+ 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
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_READLINE_HISTORY_H 1
_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
-- LIBS="-lresolv $LIBS"
--
- fi
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++fi
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+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
++
+ for ac_header in readline.h readline/readline.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52253,37 +52011,39 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-+
+
+-#undef $ac_func
+ 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
--LIBS="-lresolv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l${termlib} $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
++/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47033,73 +14542,41 @@
+ Use char because int might match the return type of a GCC
+@@ -47059,100 +14377,41 @@
#ifdef __cplusplus
extern "C"
#endif
--char _dn_expand ();
+-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 tgetent ();
int
main ()
{
--return _dn_expand ();
+-return $ac_func ();
+return tgetent ();
;
return 0;
@@ -52310,14 +52070,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_resolv__dn_expand=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_resolv__dn_expand=no
+- eval "$as_ac_var=no"
+ eval "$as_ac_Lib=no"
fi
-
@@ -52326,29 +52086,50 @@
- 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_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
+-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_Lib
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-- LIBS="-lresolv $LIBS"
+- # putprpwnam was found in libc or existing $LIBS
-
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PUTPRPWNAM 1
+-_ACEOF
+-
+-
+-
+-else
+-
+- # putprpwnam was not found, try adding libsecurity
+- case " $LIBS " in
+- *\ -lsecurity\ *)
+-
+- # putprpwnam was not found and we already had libsecurity
+- # nothing to do here by default
+- true
+eval as_val=\$$as_ac_Lib
+ if test "x$as_val" = x""yes; then :
+ TERMLIBS="-l${termlib}"; break
- fi
++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
+- ;;
+- *)
+- # 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; }
@@ -52356,7 +52137,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv $LIBS"
+-LIBS="-lsecurity $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -52367,16 +52148,16 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47108,99 +14585,106 @@
+@@ -47161,111 +14420,106 @@
#ifdef __cplusplus
extern "C"
#endif
--char __dn_expand ();
+-char putprpwnam ();
+char rl_callback_handler_install ();
int
main ()
{
--return __dn_expand ();
+-return putprpwnam ();
+return rl_callback_handler_install ();
;
return 0;
@@ -52403,42 +52184,49 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_resolv___dn_expand=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_putprpwnam=no
+ ac_cv_lib_readline_rl_callback_handler_install=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+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_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"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
+$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
+ TERMLIBS="-lreadline $TERMLIBS"
-+
+
+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
-- ac_cv_lib_resolv___dn_expand=no
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PUTPRPWNAM 1
+-_ACEOF
+ break
+else
+ TERMLIBS=
- fi
++fi
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
-+
++fi
+
+done
-+
+
+-else
+ ;;
+ no)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -52447,38 +52235,35 @@
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-+
+
+ # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
+ # alternate readline path
+ _ldflags=${LDFLAGS}
+ _cppflags=${CPPFLAGS}
-+
+
+- # putprpwnam was not found in libsecurity
+- # nothing to do here by default
+- true
+ # Add additional search path
+ LDFLAGS="-L$with_readline/lib $LDFLAGS"
+ CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+
+
+ for ac_header in readline.h history.h readline/readline.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+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
++_ACEOF
-- LIBS="-lresolv $LIBS"
--
fi
+- ;;
+- esac
+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"
@@ -52486,18 +52271,13 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_READLINE_HISTORY_H 1
+_ACEOF
-+
-+fi
+ fi
+-done
+
+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`
@@ -52507,7 +52287,13 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-+
+
+-for ac_func in putprpwnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ for termlib in ncurses curses termcap terminfo termlib; do
+ as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
@@ -52543,7 +52329,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47208,100 +14692,41 @@
+@@ -47273,100 +14527,41 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52628,11 +52414,11 @@
-
-else
-
-- # putprpwnam was not found, try adding libsecurity
+- # putprpwnam was not found, try adding libsec
- case " $LIBS " in
-- *\ -lsecurity\ *)
+- *\ -lsec\ *)
-
-- # putprpwnam was not found and we already had libsecurity
+- # putprpwnam was not found and we already had libsec
- # nothing to do here by default
- true
+eval as_val=\$$as_ac_Lib
@@ -52642,10 +52428,10 @@
- ;;
- *)
-- # 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
+- # putprpwnam was not found, try adding libsec
+- { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
+-$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
+ done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
+$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
@@ -52653,7 +52439,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
@@ -52664,7 +52450,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47310,111 +14735,68 @@
+@@ -47375,112 +14570,68 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52700,14 +52486,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_putprpwnam=yes
+- ac_cv_lib_sec_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_putprpwnam=no
+- ac_cv_lib_sec_putprpwnam=no
+ ac_cv_lib_readline_rl_callback_handler_install=no
fi
-
@@ -52718,11 +52504,11 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
--$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
--if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
-
-- LIBS="-lsecurity $LIBS"
+- LIBS="-lsec $LIBS"
-
-
-cat >>confdefs.h <<\_ACEOF
@@ -52746,7 +52532,7 @@
+fi
-- # putprpwnam was not found in libsecurity
+- # putprpwnam was not found in libsec
- # nothing to do here by default
- true
-
@@ -52765,11 +52551,12 @@
fi
-done
+-
--for ac_func in putprpwnam
+-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
@@ -52811,7 +52598,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47422,100 +14804,54 @@
+@@ -47488,100 +14639,54 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52883,14 +52670,14 @@
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-- # putprpwnam was found in libc or existing $LIBS
+- # set_auth_parameters 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 :
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
+-#define HAVE_SET_AUTH_PARAMETERS 1
-_ACEOF
+$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
@@ -52906,11 +52693,11 @@
+ ac_have_decl=0
+fi
-- # putprpwnam was not found, try adding libsec
+- # set_auth_parameters was not found, try adding libsecurity
- case " $LIBS " in
-- *\ -lsec\ *)
+- *\ -lsecurity\ *)
-
-- # putprpwnam was not found and we already had libsec
+- # set_auth_parameters was not found and we already had libsecurity
- # nothing to do here by default
- true
+cat >>confdefs.h <<_ACEOF
@@ -52919,17 +52706,17 @@
- ;;
- *)
-- # 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
+- # 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 "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5
+$as_echo_n "checking for history_list in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_history_list+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec $LIBS"
+-LIBS="-lsecurity $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -52940,16 +52727,16 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47524,112 +14860,43 @@
+@@ -47590,111 +14695,43 @@
#ifdef __cplusplus
extern "C"
#endif
--char putprpwnam ();
+-char set_auth_parameters ();
+char history_list ();
int
main ()
{
--return putprpwnam ();
+-return set_auth_parameters ();
+return history_list ();
;
return 0;
@@ -52976,14 +52763,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_sec_putprpwnam=yes
+- ac_cv_lib_security_set_auth_parameters=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_readline_history_list=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_sec_putprpwnam=no
+- ac_cv_lib_security_set_auth_parameters=no
+ ac_cv_lib_readline_history_list=no
fi
-
@@ -52994,15 +52781,15 @@
+ 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:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
-
-- LIBS="-lsec $LIBS"
+- LIBS="-lsecurity $LIBS"
-
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
+-#define HAVE_SET_AUTH_PARAMETERS 1
-_ACEOF
-
-
@@ -53010,7 +52797,7 @@
-else
-
-
-- # putprpwnam was not found in libsec
+- # set_auth_parameters was not found in libsecurity
- # nothing to do here by default
- true
-
@@ -53026,11 +52813,10 @@
fi
-done
+
+
-
-
--
-
-
-for ac_func in set_auth_parameters
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53071,7 +52857,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47637,314 +14904,299 @@
+@@ -47702,316 +14739,299 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53194,6 +52980,10 @@
+fi
-else
+-
+- # set_auth_parameters was not found, try adding libsec
+- case " $LIBS " in
+- *\ -lsec\ *)
+for ac_func in getcwd fchown chmod fchmod mknod mknod64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53204,46 +52994,30 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-- # set_auth_parameters was not found, try adding libsecurity
-- case " $LIBS " in
-- *\ -lsecurity\ *)
+- # set_auth_parameters was not found and we already had libsec
+- # nothing to do here by default
+- true
+fi
+done
-- # set_auth_parameters was not found and we already had libsecurity
-- # nothing to do here by default
-- true
-+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
-
- ;;
- *)
-- # 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
+- # set_auth_parameters was not found, try adding libsec
+- { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
+-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+fi
-+done
-+
-+for ac_func in strchr chflags
++for ac_func in strtol
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+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" "strtol" "ac_cv_func_strtol"
++if test "x$ac_cv_func_strtol" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_STRTOL 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -53266,7 +53040,7 @@
+fi
+done
+
-+for ac_func in getrlimit fsync fdatasync setpgid
++for ac_func in strchr chflags
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53296,16 +53070,16 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_set_auth_parameters=yes
+- ac_cv_lib_sec_set_auth_parameters=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_lib_security_set_auth_parameters=no
+- ac_cv_lib_sec_set_auth_parameters=no
fi
+done
+
-+for ac_func in setsid glob strpbrk crypt16 getauthuid
++for ac_func in getrlimit fsync fdatasync setpgid
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53320,13 +53094,13 @@
- 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_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
+done
-- LIBS="-lsecurity $LIBS"
-+for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+- LIBS="-lsec $LIBS"
++for ac_func in setsid glob strpbrk crypt16 getauthuid
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53341,7 +53115,7 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SET_AUTH_PARAMETERS 1
-+for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
++for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53354,7 +53128,7 @@
+fi
+done
-+for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
++for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53368,7 +53142,7 @@
+fi
+done
-+for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
++for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53378,13 +53152,13 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-- # set_auth_parameters was not found in libsecurity
+- # set_auth_parameters was not found in libsec
- # nothing to do here by default
- true
+fi
+done
-+for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
++for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53399,7 +53173,7 @@
- ;;
- esac
-+for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
++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"
@@ -53412,6 +53186,20 @@
fi
done
++for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
++fi
++done
+
+-# UnixWare 7.x has its getspnam in -lgen
+for ac_func in getpwent_r
+do :
+ ac_fn_c_check_func "$LINENO" "getpwent_r" "ac_cv_func_getpwent_r"
@@ -53423,8 +53211,7 @@
+fi
+done
--
--for ac_func in set_auth_parameters
+-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
@@ -53447,12 +53234,12 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -53555,13 +53342,13 @@
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-- # set_auth_parameters was found in libc or existing $LIBS
+- # getspnam was found in libc or existing $LIBS
-
+fi
+done
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_GETSPNAM 1
+for ac_func in nanosleep
+do :
+ ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
@@ -53577,27 +53364,27 @@
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lrt $LIBS $LIBS"
-- # set_auth_parameters was not found, try adding libsec
+- # getspnam was not found, try adding libgen
- case " $LIBS " in
-- *\ -lsec\ *)
+- *\ -lgen\ *)
-- # set_auth_parameters was not found and we already had libsec
+- # getspnam was not found and we already had libgen
- # nothing to do here by default
- true
- ;;
- *)
-- # 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
+- # getspnam was not found, try adding libgen
+- { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
+-$as_echo_n "checking for getspnam in -lgen... " >&6; }
+-if test "${ac_cv_lib_gen_getspnam+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
+$as_echo_n "checking for nanosleep in -lrt... " >&6; }
+if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec $LIBS"
+-LIBS="-lgen $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -53607,16 +53394,16 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47953,113 +15205,144 @@
+@@ -48020,112 +15040,179 @@
#ifdef __cplusplus
extern "C"
#endif
--char set_auth_parameters ();
+-char getspnam ();
+char nanosleep ();
int
main ()
{
--return set_auth_parameters ();
+-return getspnam ();
+return nanosleep ();
;
return 0;
@@ -53643,7 +53430,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_sec_set_auth_parameters=yes
+- ac_cv_lib_gen_getspnam=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_rt_nanosleep=yes;
+ ac_cv_lib_ext_rt=yes
@@ -53656,7 +53443,7 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- ac_cv_lib_sec_set_auth_parameters=no
+- ac_cv_lib_gen_getspnam=no
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_rt_nanosleep" >&5
+$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
@@ -53670,17 +53457,17 @@
- 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_gen_getspnam" >&5
+-$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
+-if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
+LIBS=$ac_check_lib_ext_save_LIBS
-- LIBS="-lsec $LIBS"
+- LIBS="-lgen $LIBS"
+if test $ac_cv_lib_ext_rt = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRT 1
+_ACEOF
-+
+
+ case "$LIBS" in
+ *-lrt*)
+ ;;
@@ -53689,13 +53476,24 @@
+ ;;
+ esac
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_GETSPNAM 1
++
+fi
+fi
+done
+
++for ac_func in utimensat
++do :
++ ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat"
++if test "x$ac_cv_func_utimensat" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_UTIMENSAT 1
+ _ACEOF
+
++fi
++done
+
+for ac_func in mlock munlock mlockall munlockall
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53704,11 +53502,12 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
+-else
+fi
+done
-+
+
+for ac_func in memalign posix_memalign hstrerror
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53719,10 +53518,12 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+- # getspnam was not found in libgen
+- # nothing to do here by default
+- true
+fi
+done
--else
+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"
@@ -53731,13 +53532,12 @@
+#define HAVE_SYS_MMAN_H 1
+_ACEOF
-+fi
+ fi
-- # set_auth_parameters was not found in libsec
-- # nothing to do here by default
-- true
+- ;;
+- esac
+done
-
++
+# setbuffer, shmget, shm_open are needed for smbtorture
+for ac_func in shmget shm_open
+do :
@@ -53750,10 +53550,8 @@
+_ACEOF
fi
-+done
+ done
-- ;;
-- esac
+for ac_func in gettext dgettext
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53764,24 +53562,20 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
- fi
- done
++fi
++done
-
-+# Find a method of generating a stack trace
-+for ac_header in execinfo.h libexc.h libunwind.h
++for ac_func in bindtextdomain textdomain
+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
--# UnixWare 7.x has its getspnam in -lgen
+fi
-
+done
-for ac_func in getspnam
@@ -53790,40 +53584,66 @@
-{ $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
-+# 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
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in strupr
++do :
++ ac_fn_c_check_func "$LINENO" "strupr" "ac_cv_func_strupr"
++if test "x$ac_cv_func_strupr" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUPR 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
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++fi
++done
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
++# Find a method of generating a stack trace
++for ac_header in execinfo.h libexc.h libunwind.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
++
++# 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
++ 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
-@@ -48067,100 +15350,66 @@
+@@ -48133,100 +15220,66 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53935,27 +53755,27 @@
-
-else
-
-- # getspnam was not found, try adding libgen
+- # getspnam was not found, try adding libsecurity
- case " $LIBS " in
-- *\ -lgen\ *)
+- *\ -lsecurity\ *)
-
-- # getspnam was not found and we already had libgen
+- # getspnam was not found and we already had libsecurity
- # 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
+- # 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 "$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="-lgen $LIBS"
+-LIBS="-lsecurity $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -53966,7 +53786,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48169,326 +15418,231 @@
+@@ -48235,326 +15288,192 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54002,14 +53822,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_gen_getspnam=yes
+- ac_cv_lib_security_getspnam=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_gen_getspnam=no
+- ac_cv_lib_security_getspnam=no
+ ac_cv_lib_exc_trace_back_stack=no
fi
-
@@ -54020,11 +53840,11 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
--$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
--if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
+-$as_echo "$ac_cv_lib_security_getspnam" >&6; }
+-if test "x$ac_cv_lib_security_getspnam" = x""yes; then
-
-- LIBS="-lgen $LIBS"
+- LIBS="-lsecurity $LIBS"
-
-
-cat >>confdefs.h <<\_ACEOF
@@ -54041,7 +53861,7 @@
-else
-
-
-- # getspnam was not found in libgen
+- # getspnam was not found in libsecurity
- # nothing to do here by default
- true
-
@@ -54067,7 +53887,6 @@
-
-
--
-for ac_func in getspnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54078,31 +53897,38 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++#############################
++# check if building with gpfs
++for ac_header in gpfs_gpl.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "gpfs_gpl.h" "ac_cv_header_gpfs_gpl_h" "$ac_includes_default"
++if test "x$ac_cv_header_gpfs_gpl_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GPFS_GPL_H 1
+ _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. */
-/* 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
--
++if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -54116,13 +53942,24 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+#include <gpfs_gpl.h>
++$as_echo "#define HAVE_GPFS 1" >>confdefs.h
++
++ default_shared_modules="$default_shared_modules vfs_gpfs"
++fi
+
++#############################################
++# check if building on Isilon OneFS
++printf "%s" "checking for Isilon OneFS... "
++save_LIBS="$LIBS"
++LIBS="$LIBS -lisi_version"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <isi_version/isi_version.h>
int
main ()
{
-return $ac_func ();
-+gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)
++get_isilon_copyright()
;
return 0;
}
@@ -54150,7 +53987,7 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
-+ samba_cv_HAVE_GPFS=yes
++ samba_cv_HAVE_ONEFS=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -54161,7 +53998,7 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ samba_cv_HAVE_GPFS=no
++ samba_cv_HAVE_ONEFS=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -54173,95 +54010,106 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+-
+- # getspnam was found in libc or existing $LIBS
+-
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+echo $samba_cv_HAVE_GPFS
-+if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
++echo $samba_cv_HAVE_ONEFS
++if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
-- # getspnam was found in libc or existing $LIBS
-+$as_echo "#define HAVE_GPFS 1" >>confdefs.h
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+-_ACEOF
++$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
-+ default_shared_modules="$default_shared_modules vfs_gpfs"
++ default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
++ default_static_modules="$default_static_modules"
++ ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
++ # Need to also add general libs for oplocks support
++ save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
+fi
+
+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"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <gpfs.h>
-+int
-+main ()
-+{
-+gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)
-+ ;
-+ return 0;
-+}
- _ACEOF
--
--
--
-+if ac_fn_c_try_link "$LINENO"; then :
-+ samba_cv_HAVE_GPFS=yes
- else
-+ samba_cv_HAVE_GPFS=no
-+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
+-else
++# Note that all the libunwind symbols in the API are defined to internal
++# platform-specific version, so we must include libunwind.h before checking
++# any of them.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5
++$as_echo_n "checking for libunwind... " >&6; }
++save_LIBS=$LIBS
-- # getspnam was not found, try adding libsecurity
+- # getspnam was not found, try adding libsec
- case " $LIBS " in
-- *\ -lsecurity\ *)
-+$as_echo "#define HAVE_GPFS 1" >>confdefs.h
+- *\ -lsec\ *)
++UNWIND_ARCH="unknown"
++if test x"$UNAME_I" != x"unknown"; then
++ UNWIND_ARCH="$UNAME_I"
++elif test x"$UNAME_M" != x"unknown"; then
++ UNWIND_ARCH="$UNAME_M"
++elif test x"$UNAME_P" != x"unknown"; then
++ UNWIND_ARCH="$UNAME_P"
++fi
-- # getspnam was not found and we already had libsecurity
+- # getspnam was not found and we already had libsec
- # nothing to do here by default
- true
-+ default_shared_modules="$default_shared_modules vfs_gpfs"
-+fi
-+LIBS="$save_LIBS"
++case "$UNWIND_ARCH" in
++ unknown)
++ # This probably won't link without
++ # the platform-specific libunwind.
++ LIBS="$LIBS -lunwind"
++ ;;
++ i386|i586|i686)
++ # Add the platform-specific libunwind module.
++ LIBS="$LIBS -lunwind -lunwind-x86"
++ ;;
++ *)
++ # Add the platform-specific libunwind module.
++ # based on uname -i, uname -m or uname -p
++ LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
++ ;;
++esac
- ;;
- *)
-- # 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
+- # 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_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
+-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+#############################################
-+# check if building on Isilon OneFS
-+printf "%s" "checking for Isilon OneFS... "
-+save_LIBS="$LIBS"
-+LIBS="$LIBS -lisi_version"
+cat 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
++#ifdef HAVE_LIBUNWIND_H
++#include <libunwind.h>
+ #endif
-char getspnam ();
-+#include <isi_version/isi_version.h>
++
int
main ()
{
-return getspnam ();
-+get_isilon_copyright()
++
++ unw_context_t ctx; unw_cursor_t cur;
++ char buf[256]; unw_word_t off;
++ unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
++ unw_get_proc_name(&cur, buf, sizeof(buf), &off);
++
;
return 0;
}
@@ -54287,110 +54135,32 @@
- 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_ONEFS=yes
- else
+- ac_cv_lib_sec_getspnam=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ samba_cv_HAVE_ONEFS=no
-+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
-+
-+$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
-+
-+ default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
-+ default_static_modules="$default_static_modules"
-+ ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
-+ # Need to also add general libs for oplocks support
-+ save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
-+fi
-+
-+LIBS="$save_LIBS"
-+
-+# Note that all the libunwind symbols in the API are defined to internal
-+# platform-specific version, so we must include libunwind.h before checking
-+# any of them.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5
-+$as_echo_n "checking for libunwind... " >&6; }
-+save_LIBS=$LIBS
-+
-+UNWIND_ARCH="unknown"
-+if test x"$UNAME_I" != x"unknown"; then
-+ UNWIND_ARCH="$UNAME_I"
-+elif test x"$UNAME_M" != x"unknown"; then
-+ UNWIND_ARCH="$UNAME_M"
-+elif test x"$UNAME_P" != x"unknown"; then
-+ UNWIND_ARCH="$UNAME_P"
-+fi
-+
-+case "$UNWIND_ARCH" in
-+ unknown)
-+ # This probably won't link without
-+ # the platform-specific libunwind.
-+ LIBS="$LIBS -lunwind"
-+ ;;
-+ i386|i586|i686)
-+ # Add the platform-specific libunwind module.
-+ LIBS="$LIBS -lunwind -lunwind-x86"
-+ ;;
-+ *)
-+ # Add the platform-specific libunwind module.
-+ # based on uname -i, uname -m or uname -p
-+ LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
-+ ;;
-+esac
-
-- ac_cv_lib_security_getspnam=no
+-
+- ac_cv_lib_sec_getspnam=no
-fi
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++if ac_fn_c_try_link "$LINENO"; then :
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
--$as_echo "$ac_cv_lib_security_getspnam" >&6; }
--if test "x$ac_cv_lib_security_getspnam" = x""yes; then
-+#ifdef HAVE_LIBUNWIND_H
-+#include <libunwind.h>
-+#endif
-
-- LIBS="-lsecurity $LIBS"
-+int
-+main ()
-+{
-
-+ unw_context_t ctx; unw_cursor_t cur;
-+ char buf[256]; unw_word_t off;
-+ unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
-+ unw_get_proc_name(&cur, buf, sizeof(buf), &off);
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
-+ ;
-+ return 0;
-+}
- _ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-
+-{ $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+- LIBS="-lsec $LIBS"
+$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
--else
--
--
-- # getspnam was not found in libsecurity
-- # nothing to do here by default
-- true
+-cat >>confdefs.h <<\_ACEOF
+-#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
@@ -54400,8 +54170,18 @@
+if test "x$ac_cv_header_libunwind_ptrace_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUNWIND_PTRACE_H 1
-+_ACEOF
+ _ACEOF
+-
+-
+-else
+-
+-
+- # getspnam was not found in libsec
+- # nothing to do here by default
+- true
+-
+-
fi
- ;;
@@ -54413,7 +54193,8 @@
-
-
-
--for ac_func in getspnam
+-
+-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
@@ -54452,7 +54233,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48496,857 +15650,641 @@
+@@ -48562,856 +15481,641 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54527,13 +54308,13 @@
+$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
+if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then :
-- # getspnam was found in libc or existing $LIBS
+- # bigcrypt was found in libc or existing $LIBS
+ LIBUNWIND_PTRACE="-lunwind-ptrace";
+$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-#define HAVE_BIGCRYPT 1
-_ACEOF
+
+else
@@ -54545,14 +54326,14 @@
else
-- # getspnam was not found, try adding libsec
+- # bigcrypt was not found, try adding libsecurity
- case " $LIBS " in
-- *\ -lsec\ *)
+- *\ -lsecurity\ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ LIBS=$save_LIBS
-- # getspnam was not found and we already had libsec
+- # bigcrypt was not found and we already had libsecurity
- # nothing to do here by default
- true
+fi
@@ -54561,14 +54342,14 @@
- ;;
- *)
-- # 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
+- # 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="-lsec $LIBS"
+-LIBS="-lsecurity $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+# To use libunwind-ptrace, we also need to make some ptrace system calls.
@@ -54600,7 +54381,7 @@
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
#endif
--char getspnam ();
+-char bigcrypt ();
+#if HAVE_SYS_PTRACE_H
+#include <sys/ptrace.h>
+#endif
@@ -54608,7 +54389,7 @@
int
main ()
{
--return getspnam ();
+-return bigcrypt ();
+
+ pid_t me = (pid_t)-1;
+ ptrace(PTRACE_ATTACH, me, 0, 0);
@@ -54640,7 +54421,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_sec_getspnam=yes
+- ac_cv_lib_security_bigcrypt=yes
+if ac_fn_c_try_link "$LINENO"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -54653,7 +54434,7 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-- ac_cv_lib_sec_getspnam=no
+- ac_cv_lib_security_bigcrypt=no
-fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
@@ -54664,18 +54445,18 @@
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
--$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
--if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
-- LIBS="-lsec $LIBS"
+- LIBS="-lsecurity $LIBS"
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-#define HAVE_BIGCRYPT 1
+for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54713,7 +54494,7 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-- # getspnam was not found in libsec
+- # bigcrypt was not found in libsecurity
- # nothing to do here by default
- true
+fi
@@ -54760,19 +54541,7 @@
+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
-
+-
-for ac_func in bigcrypt
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54783,7 +54552,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in getdents __getdents _lseek __lseek _read __read
++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"
@@ -54798,12 +54567,12 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -54813,7 +54582,7 @@
+done
-#undef $ac_func
-+for ac_func in getdirentries _write __write _fork __fork
++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"
@@ -54846,7 +54615,7 @@
- ;
- return 0;
-}
-+for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++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"
@@ -54896,7 +54665,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 __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
++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"
@@ -54907,10 +54676,22 @@
_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
@@ -54940,9 +54721,9 @@
+fi
+done
-- # bigcrypt was not found, try adding libsecurity
+- # bigcrypt was not found, try adding libsec
- case " $LIBS " in
-- *\ -lsecurity\ *)
+- *\ -lsec\ *)
+for ac_func in open64 _open64 __open64 creat64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54953,7 +54734,7 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-- # bigcrypt was not found and we already had libsecurity
+- # bigcrypt was not found and we already had libsec
- # nothing to do here by default
- true
+fi
@@ -54961,14 +54742,14 @@
- ;;
- *)
-- # 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
+- # bigcrypt was not found, try adding libsec
+- { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
+-$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
+-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+for ac_func in prctl
@@ -55028,13 +54809,13 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_bigcrypt=yes
+- ac_cv_lib_sec_bigcrypt=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
-- ac_cv_lib_security_bigcrypt=no
+- ac_cv_lib_sec_bigcrypt=no
-fi
+$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
@@ -55043,11 +54824,11 @@
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
--$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
--if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
+-{ $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="-lsecurity $LIBS"
+- LIBS="-lsec $LIBS"
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -55097,7 +54878,7 @@
+ if test x"$linux_getgrouplist_ok" = x"yes"; then
-- # bigcrypt was not found in libsecurity
+- # bigcrypt was not found in libsec
- # nothing to do here by default
- true
-
@@ -55129,7 +54910,8 @@
+#
-
--for ac_func in bigcrypt
+-
+-for ac_func in getprpwnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -55155,7 +54937,7 @@
- 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
@@ -55163,7 +54945,7 @@
-#endif
-
-#undef $ac_func
--
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -55217,21 +54999,13 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_func_stat64=yes
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
-+$as_echo "$ac_cv_func_stat64" >&6; }
-+ if test x$ac_cv_func_stat64 = xyes ; then
-
+-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_STAT64 1" >>confdefs.h
-+
-+ fi
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_func_stat64=yes
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -55243,21 +55017,55 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+-
+- # getprpwnam was found in libc or existing $LIBS
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
++$as_echo "$ac_cv_func_stat64" >&6; }
++ if test x$ac_cv_func_stat64 = xyes ; then
-- # bigcrypt was found in libc or existing $LIBS
++$as_echo "#define HAVE_STAT64 1" >>confdefs.h
+
+-else
++ fi
++fi
+
+- # getprpwnam was not found, try adding libsecurity
+- case " $LIBS " in
+- *\ -lsecurity\ *)
+if test x$ac_cv_func_lstat64 = xno ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lstat64 in <sys/stat.h>" >&5
+$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+- # getprpwnam was not found and we already had libsecurity
+- # nothing to do here by default
+- true
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+#include <sys/stat.h>
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+- ;;
+- *)
+- # getprpwnam was not found, try adding libsecurity
+- { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
+-$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_getprpwnam+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsecurity $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+int
+main ()
+{
@@ -55266,6 +55074,8 @@
+ return 0;
+}
_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_lstat64=yes
+fi
@@ -55275,36 +55085,10 @@
+$as_echo "$ac_cv_func_lstat64" >&6; }
+ if test x$ac_cv_func_lstat64 = xyes ; then
+ $as_echo "#define HAVE_LSTAT64 Whether lstat64() is available" >>confdefs.h
-
++
+ fi
+fi
-
--
--else
--
-- # bigcrypt was not found, try adding libsec
-- case " $LIBS " in
-- *\ -lsec\ *)
--
-- # bigcrypt was not found and we already had libsec
-- # nothing to do here by default
-- true
--
-- ;;
-- *)
-- # bigcrypt was not found, try adding libsec
-- { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
--$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++
+if test x$ac_cv_func_fstat64 = xno ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fstat64 in <sys/stat.h>" >&5
+$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
@@ -55319,13 +55103,13 @@
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
#endif
--char bigcrypt ();
+-char getprpwnam ();
+#include <sys/stat.h>
+
int
main ()
{
--return bigcrypt ();
+-return getprpwnam ();
+struct stat64 st64; exit(fstat64(0,&st64));
;
return 0;
@@ -55352,12 +55136,12 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_sec_bigcrypt=yes
+- ac_cv_lib_security_getprpwnam=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_sec_bigcrypt=no
+- ac_cv_lib_security_getprpwnam=no
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_fstat64=yes
fi
@@ -55375,11 +55159,11 @@
+
+ fi
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
--$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
--if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
+-$as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
+-if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then
-- LIBS="-lsec $LIBS"
+- LIBS="-lsecurity $LIBS"
+#################################################
+# Check whether struct stat has timestamps with sub-second resolution.
+#
@@ -55389,7 +55173,7 @@
+if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then :
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+-#define HAVE_GETPRPWNAM 1
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
_ACEOF
@@ -55410,7 +55194,7 @@
+ samba_cv_stat_hires=yes
+fi
-- # bigcrypt was not found in libsec
+- # getprpwnam was not found in libsecurity
- # nothing to do here by default
- true
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec.tv_nsec" "ac_cv_member_struct_stat_st_mtimespec_tv_nsec" "$ac_includes_default"
@@ -55428,16 +55212,15 @@
- 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 :
-
--fi
--done
++
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIME_N 1
+_ACEOF
+# AIX
+ samba_cv_stat_hires=yes
-+fi
+ fi
+-done
+ac_fn_c_check_member "$LINENO" "struct stat" "st_umtime" "ac_cv_member_struct_stat_st_umtime" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then :
@@ -55578,27 +55361,27 @@
-else
+fi
-- # getprpwnam was not found, try adding libsecurity
+- # getprpwnam was not found, try adding libsec
- case " $LIBS " in
-- *\ -lsecurity\ *)
+- *\ -lsec\ *)
-- # getprpwnam was not found and we already had libsecurity
+- # getprpwnam was not found and we already had libsec
- # nothing to do here by default
- true
- ;;
- *)
-- # getprpwnam was not found, try adding libsecurity
-- { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
--$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_getprpwnam+set}" = set; then
+- # getprpwnam was not found, try adding libsec
+- { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsec" >&5
+-$as_echo_n "checking for getprpwnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether there is DOS flags support in the stat struct" >&5
+$as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
+if test "${samba_cv_stat_dos_flags+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
+-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -55653,14 +55436,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_security_getprpwnam=yes
+- ac_cv_lib_sec_getprpwnam=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_stat_dos_flags=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_security_getprpwnam=no
+- ac_cv_lib_sec_getprpwnam=no
+ samba_cv_stat_dos_flags=no
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -55670,11 +55453,11 @@
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
--$as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
--if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
+-$as_echo "$ac_cv_lib_sec_getprpwnam" >&6; }
+-if test "x$ac_cv_lib_sec_getprpwnam" = x""yes; then
-
-- LIBS="-lsecurity $LIBS"
+- LIBS="-lsec $LIBS"
-
-
-cat >>confdefs.h <<\_ACEOF
@@ -55686,7 +55469,7 @@
-else
-
-
-- # getprpwnam was not found in libsecurity
+- # getprpwnam was not found in libsec
- # nothing to do here by default
- true
-
@@ -55702,11 +55485,11 @@
fi
-done
+
-
-
-
-
--for ac_func in getprpwnam
+-for ac_func in strsignal
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -55747,7 +55530,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49354,100 +16292,43 @@
+@@ -49419,85 +16123,43 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -55820,69 +55603,62 @@
+if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
-- # getprpwnam was found in libc or existing $LIBS
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
+#define HAVE_LIBRESOLV 1
_ACEOF
+-fi
+-done
+ LIBS="-lresolv $LIBS"
+fi
--else
--
-- # getprpwnam was not found, try adding libsec
-- case " $LIBS " in
-- *\ -lsec\ *)
--
-- # getprpwnam was not found and we already had libsec
-- # nothing to do here by default
-- true
--
-- ;;
-- *)
-- # getprpwnam was not found, try adding libsec
-- { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsec" >&5
--$as_echo_n "checking for getprpwnam in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then
+-############################################
+-# Check if we have libattr
+-case "$host_os" in
+- *osf*)
+- { $as_echo "$as_me:$LINENO: checking for library containing getproplist" >&5
+-$as_echo_n "checking for library containing getproplist... " >&6; }
+-if test "${ac_cv_search_getproplist+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dn_expand in -lresolv" >&5
+$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec $LIBS"
+- ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -49456,111 +16337,44 @@
+@@ -49506,108 +16168,44 @@
#ifdef __cplusplus
extern "C"
#endif
--char getprpwnam ();
+-char getproplist ();
+char _dn_expand ();
int
main ()
{
--return getprpwnam ();
+-return getproplist ();
+return _dn_expand ();
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-for ac_lib in '' proplist; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -55903,63 +55679,56 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_sec_getprpwnam=yes
+- ac_cv_search_getproplist=$ac_res
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_getproplist+set}" = set; then
+- break
+-fi
+-done
+-if test "${ac_cv_search_getproplist+set}" = set; then
+- :
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_resolv__dn_expand=yes
else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_sec_getprpwnam=no
+- ac_cv_search_getproplist=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+ ac_cv_lib_resolv__dn_expand=no
fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getproplist" >&5
+-$as_echo "$ac_cv_search_getproplist" >&6; }
+-ac_res=$ac_cv_search_getproplist
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
--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
++LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
--$as_echo "$ac_cv_lib_sec_getprpwnam" >&6; }
--if test "x$ac_cv_lib_sec_getprpwnam" = x""yes; then
--
-- LIBS="-lsec $LIBS"
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv__dn_expand" >&5
+$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRESOLV 1
- _ACEOF
++_ACEOF
--
--
--else
--
--
-- # getprpwnam was not found in libsec
-- # nothing to do here by default
-- true
--
--
--fi
--
-- ;;
-- esac
+ LIBS="-lresolv $LIBS"
- fi
--done
--
++fi
-
-
--for ac_func in strsignal
+-for ac_func in getproplist fgetproplist setproplist fsetproplist
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -55998,7 +55767,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49568,85 +16382,79 @@
+@@ -49615,103 +16213,80 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56080,13 +55849,6 @@
-done
--############################################
--# Check if we have libattr
--case "$host_os" in
-- *osf*)
-- { $as_echo "$as_me:$LINENO: checking for library containing getproplist" >&5
--$as_echo_n "checking for library containing getproplist... " >&6; }
--if test "${ac_cv_search_getproplist+set}" = set; then
+#
+# Check for the functions putprpwnam, set_auth_parameters,
+# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
@@ -56106,62 +55868,83 @@
+
+
+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+
+
+
+
+-for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+ # 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_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsecurity $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
++/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -49655,212 +16463,90 @@
+ Use char because int might match the return type of a GCC
+@@ -49719,183 +16294,89 @@
#ifdef __cplusplus
extern "C"
#endif
--char getproplist ();
+-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 putprpwnam ();
int
main ()
{
--return getproplist ();
+-return $ac_func ();
+return putprpwnam ();
;
return 0;
}
_ACEOF
--for ac_lib in '' proplist; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56182,53 +55965,48 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_search_getproplist=$ac_res
--else
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_security_putprpwnam=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+- eval "$as_ac_var=no"
++ ac_cv_lib_security_putprpwnam=no
+ fi
-
--fi
--
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_getproplist+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_getproplist+set}" = set; then
-- :
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_security_putprpwnam=yes
- else
-- ac_cv_search_getproplist=no
-+ ac_cv_lib_security_putprpwnam=no
- fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
+- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getproplist" >&5
--$as_echo "$ac_cv_search_getproplist" >&6; }
--ac_res=$ac_cv_search_getproplist
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_putprpwnam" >&5
+$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
+if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then :
-
--fi
++
+ LIBS="-lsecurity $LIBS"
-
-
++
++
+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
+-fi
+-done
--for ac_func in getproplist fgetproplist setproplist fsetproplist
+-for ac_func in sizeof_proplist_entry
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -56343,85 +56121,69 @@
-done
+ # putprpwnam was found in libc or existing $LIBS
-
+- ;;
+- *)
+- { $as_echo "$as_me:$LINENO: checking for library containing getxattr" >&5
+-$as_echo_n "checking for library containing getxattr... " >&6; }
+-if test "${ac_cv_search_getxattr+set}" = set; then
++
+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
-
-
-
--for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
++
++
++
++else
++
+ # putprpwnam was not found, try adding libsec
+ case " $LIBS " in
+ *\ -lsec\ *)
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
++
+ # putprpwnam was not found and we already had libsec
+ # nothing to do here by default
+ true
-
--#undef $ac_func
++
+ ;;
+ *)
+ # putprpwnam was not found, try adding libsec
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsec" >&5
+$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
+if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsec $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -49868,100 +16554,91 @@
+@@ -49904,109 +16385,91 @@
#ifdef __cplusplus
extern "C"
#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
+-char getxattr ();
+char putprpwnam ();
int
main ()
{
--return $ac_func ();
+-return getxattr ();
+return putprpwnam ();
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-for ac_lib in '' attr; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56442,7 +56204,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_search_getxattr=$ac_res
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_sec_putprpwnam=yes
else
@@ -56462,34 +56224,42 @@
+
+
+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
+
+
+-fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_getxattr+set}" = set; then
+- break
+-fi
+-done
+-if test "${ac_cv_search_getxattr+set}" = set; then
+- :
+ else
+- ac_cv_search_getxattr=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+
+
-+
-+else
-+
-+
+ # putprpwnam was not found in libsec
+ # nothing to do here by default
+ true
+
-
-- eval "$as_ac_var=no"
++
fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getxattr" >&5
+-$as_echo "$ac_cv_search_getxattr" >&6; }
+-ac_res=$ac_cv_search_getxattr
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
+ ;;
+ esac
-+
+
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+done
+
+
@@ -56499,21 +56269,18 @@
+do :
+ ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
+if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_SET_AUTH_PARAMETERS 1
- _ACEOF
++_ACEOF
--fi
--done
+ # set_auth_parameters was found in libc or existing $LIBS
-+
-+
+
+
+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
-+
--for ac_func in sizeof_proplist_entry
+
+-for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -56564,7 +56331,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49969,82 +16646,89 @@
+@@ -50014,105 +16477,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56613,12 +56380,14 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_lib_security_set_auth_parameters=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_set_auth_parameters" >&5
+$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
+if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then :
@@ -56638,15 +56407,9 @@
+ true
+
-- eval "$as_ac_var=no"
- fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ ;;
-+ esac
-+
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -56655,86 +56418,107 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+
-+
-+
++ ;;
++ esac
+
+ 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"
+if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_SET_AUTH_PARAMETERS 1
- _ACEOF
-
--fi
--done
++_ACEOF
++
+ # set_auth_parameters was found in libc or existing $LIBS
++
-- ;;
-- *)
-- { $as_echo "$as_me:$LINENO: checking for library containing getxattr" >&5
--$as_echo_n "checking for library containing getxattr... " >&6; }
--if test "${ac_cv_search_getxattr+set}" = set; then
-+
+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
-+
-+
-+
-+else
-+
+
+
+
+-for ac_func in getea fgetea lgetea listea flistea llistea
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+ # set_auth_parameters was not found, try adding libsec
+ case " $LIBS " in
+ *\ -lsec\ *)
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ # set_auth_parameters was not found and we already had libsec
+ # nothing to do here by default
+ true
-+
+
+-#undef $ac_func
+ ;;
+ *)
+ # set_auth_parameters was not found, try adding libsec
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsec" >&5
+$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
+if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $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. */
++/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -50053,109 +16737,92 @@
+ Use char because int might match the return type of a GCC
+@@ -50120,105 +16568,92 @@
#ifdef __cplusplus
extern "C"
#endif
--char getxattr ();
+-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 set_auth_parameters ();
int
main ()
{
--return getxattr ();
+-return $ac_func ();
+return set_auth_parameters ();
;
return 0;
}
_ACEOF
--for ac_lib in '' attr; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -56755,18 +56539,20 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_search_getxattr=$ac_res
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_sec_set_auth_parameters=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ ac_cv_lib_sec_set_auth_parameters=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_set_auth_parameters" >&5
+$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
+if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then :
@@ -56775,43 +56561,37 @@
+
+
+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
-
-
--fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_getxattr+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_getxattr+set}" = set; then
-- :
- else
-- ac_cv_search_getxattr=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
+
+
++
++else
++
++
+ # set_auth_parameters was not found in libsec
+ # nothing to do here by default
+ true
+
-+
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getxattr" >&5
--$as_echo "$ac_cv_search_getxattr" >&6; }
--ac_res=$ac_cv_search_getxattr
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-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
+
+ ;;
+ esac
fi
-+done
+ done
@@ -56827,12 +56607,12 @@
+
+ # getspnam was found in libc or existing $LIBS
+
-+
+
+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
--for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
+-for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -56883,7 +56663,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50163,65 +16830,47 @@
+@@ -50226,103 +16661,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56932,14 +56712,12 @@
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
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_getspnam" >&5
+$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
+if test "x$ac_cv_lib_gen_getspnam" = x""yes; then :
@@ -56959,9 +56737,15 @@
+ true
+
+- eval "$as_ac_var=no"
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++ ;;
++ esac
++
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -56970,35 +56754,30 @@
-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
++done
+
-+ ;;
-+ esac
-
- fi
- done
-@@ -50229,39 +16878,43 @@
-
-
-
++
++
++
+ for ac_func in getspnam
+do :
+ ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
+if test "x$ac_cv_func_getspnam" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETSPNAM 1
-+_ACEOF
-+
+ _ACEOF
+
+-fi
+-done
+ # getspnam was found in libc or existing $LIBS
-+
-+
+
+
+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
--for ac_func in getea fgetea lgetea listea flistea llistea
+-for ac_func in flistxattr removexattr lremovexattr fremovexattr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57049,7 +56828,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50269,105 +16922,90 @@
+@@ -50330,102 +16753,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57098,14 +56877,12 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ ac_cv_lib_security_getspnam=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getspnam" >&5
+$as_echo "$ac_cv_lib_security_getspnam" >&6; }
+if test "x$ac_cv_lib_security_getspnam" = x""yes; then :
@@ -57125,9 +56902,15 @@
+ true
+
+- eval "$as_ac_var=no"
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++ ;;
++ esac
++
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -57136,34 +56919,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
--_ACEOF
++done
+
-+ ;;
-+ esac
-
- fi
- done
-
-
-
++
++
+ for ac_func in getspnam
+do :
+ ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
+if test "x$ac_cv_func_getspnam" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETSPNAM 1
-+_ACEOF
-+
+ _ACEOF
+
+-fi
+-done
+ # getspnam was found in libc or existing $LIBS
-+
+
+$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
++
-
--for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
+-for ac_func in setxattr lsetxattr fsetxattr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57214,7 +56992,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50375,103 +17013,91 @@
+@@ -50433,103 +16844,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57338,7 +57116,7 @@
+ # nothing to do here by default
+ true
--for ac_func in flistxattr removexattr lremovexattr fremovexattr
+-for ac_func in attr_get attr_list attr_set attr_remove
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57380,7 +57158,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50479,102 +17105,90 @@
+@@ -50537,103 +16936,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57490,10 +57268,10 @@
+$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
-+
--for ac_func in setxattr lsetxattr fsetxattr
+
+-for ac_func in attr_getf attr_listf attr_setf attr_removef
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57544,7 +57322,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50582,103 +17196,91 @@
+@@ -50641,107 +17027,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57652,13 +57430,19 @@
-fi
-done
+ # getprpwnam was found in libc or existing $LIBS
-
-
++
++
+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
+- ;;
+-esac
+-########################################################
+-# Check if attropen() is present if this is Solaris
+-case "$host_os" in
+- *solaris*)
--for ac_func in attr_get attr_list attr_set attr_remove
+-for ac_func in attropen
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57709,7 +57493,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50686,103 +17288,90 @@
+@@ -50749,190 +17119,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57758,71 +57542,147 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ ac_cv_lib_security_getprpwnam=no
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-done
+-
+- ;;
+-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getprpwnam" >&5
+$as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
+if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then :
-+
+
+-########################################################
+-# Do xattr functions take additional options like on Darwin?
+-if test x"$ac_cv_func_getxattr" = x"yes" ; then
+- { $as_echo "$as_me:$LINENO: checking whether xattr interface takes additional options" >&5
+-$as_echo_n "checking whether xattr interface takes additional options... " >&6; }
+-if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+ LIBS="-lsecurity $LIBS"
-+
-+
+
+- old_LIBS=$LIBS
+- LIBS="$LIBS $ACL_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+- #include <sys/types.h>
+- #if HAVE_ATTR_XATTR_H
+- #include <attr/xattr.h>
+- #elif HAVE_SYS_XATTR_H
+- #include <sys/xattr.h>
+- #endif
+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+
+
+-int
+-main ()
+-{
+
+- getxattr(0, 0, 0, 0, 0, 0);
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- smb_attr_cv_xattr_add_opt=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
+-fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # getprpwnam was not found in libsecurity
+ # nothing to do here by default
+ true
+
-- eval "$as_ac_var=no"
fi
+-{ $as_echo "$as_me:$LINENO: result: $smb_attr_cv_xattr_add_opt" >&5
+-$as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
+- if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+-cat >>confdefs.h <<\_ACEOF
+-#define XATTR_ADD_OPT 1
+-_ACEOF
+ ;;
+ esac
-+
+
+- fi
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+done
+
+-# Check if we have extattr
+-case "$host_os" in
+- *freebsd4* | *dragonfly* )
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BROKEN_EXTATTR 1
+
-+
-+
+ for ac_func in getprpwnam
+do :
+ ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
+if test "x$ac_cv_func_getprpwnam" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPRPWNAM 1
_ACEOF
--fi
--done
+- ;;
+- *)
+ # getprpwnam was found in libc or existing $LIBS
-
-
++
++
+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
--for ac_func in attr_getf attr_listf attr_setf attr_removef
+-for ac_func in extattr_delete_fd extattr_delete_file extattr_delete_link
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57873,7 +57733,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50790,107 +17379,77 @@
+@@ -50940,102 +17210,77 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57980,22 +57840,18 @@
fi
done
-- ;;
--esac
--########################################################
--# Check if attropen() is present if this is Solaris
-+############################################
-+# Check if we have libattr
- case "$host_os" in
-- *solaris*)
-
--for ac_func in attropen
+-
+-for ac_func in extattr_get_fd extattr_get_file extattr_get_link
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++############################################
++# Check if we have libattr
++case "$host_os" in
+ *osf*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getproplist" >&5
+$as_echo_n "checking for library containing getproplist... " >&6; }
@@ -58029,7 +57885,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50898,62 +17457,53 @@
+@@ -51043,62 +17288,53 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58097,10 +57953,10 @@
- eval "$as_ac_var=no"
+else
+ ac_cv_search_getproplist=no
-+fi
+ fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getproplist" >&5
+$as_echo "$ac_cv_search_getproplist" >&6; }
+ac_res=$ac_cv_search_getproplist
@@ -58128,47 +57984,10 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -50961,127 +17511,40 @@
+@@ -51106,39 +17342,40 @@
fi
done
-- ;;
--esac
--
--########################################################
--# Do xattr functions take additional options like on Darwin?
--if test x"$ac_cv_func_getxattr" = x"yes" ; then
-- { $as_echo "$as_me:$LINENO: checking whether xattr interface takes additional options" >&5
--$as_echo_n "checking whether xattr interface takes additional options... " >&6; }
--if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
--
-- old_LIBS=$LIBS
-- LIBS="$LIBS $ACL_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
-- #include <sys/types.h>
-- #if HAVE_ATTR_XATTR_H
-- #include <attr/xattr.h>
-- #elif HAVE_SYS_XATTR_H
-- #include <sys/xattr.h>
-- #endif
--
--int
--main ()
--{
--
-- getxattr(0, 0, 0, 0, 0, 0);
--
-- ;
-- return 0;
--}
+ for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58177,75 +57996,30 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- smb_attr_cv_xattr_add_opt=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $smb_attr_cv_xattr_add_opt" >&5
--$as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
-- if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
++_ACEOF
++
++fi
+done
--cat >>confdefs.h <<\_ACEOF
--#define XATTR_ADD_OPT 1
+ for ac_func in sizeof_proplist_entry
+do :
+ ac_fn_c_check_func "$LINENO" "sizeof_proplist_entry" "ac_cv_func_sizeof_proplist_entry"
+if test "x$ac_cv_func_sizeof_proplist_entry" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SIZEOF_PROPLIST_ENTRY 1
- _ACEOF
++_ACEOF
-- fi
- fi
++fi
+done
--# Check if we have extattr
--case "$host_os" in
-- *freebsd4* | *dragonfly* )
--
--cat >>confdefs.h <<\_ACEOF
--#define BROKEN_EXTATTR 1
--_ACEOF
--
-- ;;
-+ ;;
- *)
--
--
--
--for ac_func in extattr_delete_fd extattr_delete_file extattr_delete_link
+-for ac_func in extattr_list_fd extattr_list_file extattr_list_link
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ ;;
++ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getxattr" >&5
+$as_echo_n "checking for library containing getxattr... " >&6; }
+if test "${ac_cv_search_getxattr+set}" = set; then :
@@ -58278,7 +58052,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51089,62 +17552,66 @@
+@@ -51146,62 +17383,118 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58365,35 +58139,23 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-
-- eval "$as_ac_var=no"
- fi
++
++fi
+done
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--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 getea fgetea lgetea listea flistea llistea
+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
-@@ -51152,102 +17619,64 @@
- fi
- done
-
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
+ for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58404,20 +58166,10 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-+fi
+- eval "$as_ac_var=no"
+ fi
+done
-
--
--for ac_func in extattr_get_fd extattr_get_file extattr_get_link
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $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 flistxattr removexattr lremovexattr fremovexattr
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58426,28 +58178,21 @@
+ 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. */
--/* 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. */
++_ACEOF
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+done
-
--#undef $ac_func
++
+ for ac_func in setxattr lsetxattr fsetxattr
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58457,96 +58202,49 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++
+fi
+done
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
++
+ for ac_func in attr_get attr_list attr_set attr_remove
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) 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"
+@@ -51209,102 +17502,141 @@
fi
-+done
+ done
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+ for ac_func in attr_getf attr_listf attr_setf attr_removef
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -51255,102 +17684,89 @@
- fi
- done
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++fi
++done
+
+ ;;
+esac
+-for ac_func in extattr_set_fd extattr_set_file extattr_set_link
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+########################################################
+# Check if attropen() is present if this is Solaris
+case "$host_os" in
@@ -58557,54 +58255,38 @@
+if test "x$ac_cv_func_attropen" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_ATTROPEN 1
-+_ACEOF
-
-+fi
-+done
-
--for ac_func in extattr_list_fd extattr_list_file extattr_list_link
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $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
-+ ;;
-+esac
-+
-+########################################################
-+# Do xattr functions take additional options like on Darwin?
-+if test x"$ac_cv_func_getxattr" = x"yes" ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether xattr interface takes additional options" >&5
-+$as_echo_n "checking whether xattr interface takes additional options... " >&6; }
-+if test "${smb_attr_cv_xattr_add_opt+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++fi
++done
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++ ;;
++esac
-#undef $ac_func
-+ old_LIBS=$LIBS
-+ LIBS="$LIBS $ACL_LIBS"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++########################################################
++# Do xattr functions take additional options like on Darwin?
++if test x"$ac_cv_func_getxattr" = x"yes" ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether xattr interface takes additional options" >&5
++$as_echo_n "checking whether xattr interface takes additional options... " >&6; }
++if test "${smb_attr_cv_xattr_add_opt+set}" = set; then :
++ $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
@@ -58619,6 +58301,11 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++ old_LIBS=$LIBS
++ LIBS="$LIBS $ACL_LIBS"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
+ #include <sys/types.h>
+ #if HAVE_ATTR_XATTR_H
+ #include <attr/xattr.h>
@@ -58667,28 +58354,21 @@
+ smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-- eval "$as_ac_var=no"
- fi
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $smb_attr_cv_xattr_add_opt" >&5
+$as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
+ if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+- eval "$as_ac_var=no"
+$as_echo "#define XATTR_ADD_OPT 1" >>confdefs.h
+
+ fi
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+# Check if we have extattr
+case "$host_os" in
+ *freebsd4* | *dragonfly* )
@@ -58703,26 +58383,20 @@
+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
-@@ -51358,102 +17774,38 @@
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
fi
- done
-
--
--
--
--for ac_func in extattr_set_fd extattr_set_file extattr_set_link
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $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. */
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++done
++
+ for ac_func in extattr_get_fd extattr_get_file extattr_get_link
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58731,50 +58405,11 @@
+ 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. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
++_ACEOF
++
+fi
+done
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
++
+ for ac_func in extattr_list_fd extattr_list_file extattr_list_link
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58783,48 +58418,11 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) 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
++_ACEOF
++
++fi
+done
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--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 extattr_set_fd extattr_set_file extattr_set_link
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58834,7 +58432,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51465,7 +17817,7 @@
+@@ -51316,7 +17648,7 @@
esac
# Check whether --enable-static was given.
@@ -58843,7 +58441,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -51487,7 +17839,7 @@
+@@ -51338,7 +17670,7 @@
fi
# Check whether --enable-shared was given.
@@ -58852,7 +58450,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -51514,16 +17866,16 @@
+@@ -51365,16 +17697,16 @@
PIE_CFLAGS=""
PIE_LDFLAGS=""
# Check whether --enable-pie was given.
@@ -58872,7 +58470,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51532,11 +17884,11 @@
+@@ -51383,11 +17715,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5'
@@ -58887,7 +58485,7 @@
then
samba_cv_fpie=yes
else
-@@ -51545,7 +17897,7 @@
+@@ -51396,7 +17728,7 @@
rm -f conftest*
fi
@@ -58896,7 +58494,7 @@
$as_echo "$samba_cv_fpie" >&6; }
if test x"${samba_cv_fpie}" = x"yes"
then
-@@ -51557,16 +17909,16 @@
+@@ -51408,16 +17740,16 @@
# Set defaults
RELRO_LDFLAGS=""
# Check whether --enable-relro was given.
@@ -58916,7 +58514,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51575,11 +17927,11 @@
+@@ -51426,11 +17758,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -58931,7 +58529,7 @@
then
samba_cv_relro=yes
else
-@@ -51588,7 +17940,7 @@
+@@ -51439,7 +17771,7 @@
rm -f conftest*
fi
@@ -58940,7 +58538,7 @@
$as_echo "$samba_cv_relro" >&6; }
if test x"${samba_cv_relro}" = x"yes"
then
-@@ -51617,7 +17969,7 @@
+@@ -51468,7 +17800,7 @@
# You need to specify how to create a shared library and
# how to compile C code to produce PIC object files
@@ -58949,18 +58547,24 @@
$as_echo_n "checking ability to build shared libraries... " >&6; }
# and these are for particular systems
-@@ -51625,9 +17977,7 @@
- *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
- case "$host_os" in *linux*)
-
+@@ -51476,14 +17808,10 @@
+ *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
+ case "$host_os" in
+ *linux*)
-cat >>confdefs.h <<\_ACEOF
-#define LINUX 1
-_ACEOF
+$as_echo "#define LINUX 1" >>confdefs.h
;;
+ *qnx*)
+-cat >>confdefs.h <<\_ACEOF
+-#define QNX 1
+-_ACEOF
++$as_echo "#define QNX 1" >>confdefs.h
+ ;;
esac
BLDSHARED="true"
-@@ -51639,15 +17989,11 @@
+@@ -51494,15 +17822,11 @@
DYNEXP="-Wl,--export-dynamic"
PICFLAG="-fPIC"
SONAMEFLAG="-Wl,-soname="
@@ -58978,7 +58582,7 @@
BLDSHARED="true"
LDSHFLAGS="-G"
-@@ -51665,33 +18011,23 @@
+@@ -51520,33 +17844,23 @@
LDSHFLAGS="-G \${CFLAGS}"
fi
@@ -59017,7 +58621,7 @@
;;
*netbsd* | *freebsd* | *dragonfly* )
-@@ -51701,14 +18037,10 @@
+@@ -51556,14 +17870,10 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC -DPIC"
@@ -59034,7 +58638,7 @@
;;
*openbsd*) BLDSHARED="true"
-@@ -51717,26 +18049,18 @@
+@@ -51572,26 +17882,18 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC"
@@ -59065,7 +58669,7 @@
;;
esac
-@@ -51750,15 +18074,11 @@
+@@ -51605,15 +17907,11 @@
PICFLAG="-KPIC"
fi
@@ -59083,7 +58687,7 @@
BLDSHARED="true"
# use expfull to export underscored symbols
-@@ -51774,25 +18094,17 @@
+@@ -51629,25 +17927,17 @@
fi
@@ -59113,7 +58717,7 @@
# Use special PIC flags for the native HP-UX compiler.
BLDSHARED="true"
-@@ -51814,84 +18126,58 @@
+@@ -51669,74 +17959,52 @@
DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
fi
@@ -59129,18 +58733,6 @@
+$as_echo "#define POSIX_ACL_NEEDS_MASK 1" >>confdefs.h
;;
- *qnx*)
--cat >>confdefs.h <<\_ACEOF
--#define QNX 1
--_ACEOF
-+$as_echo "#define QNX 1" >>confdefs.h
-
-- cat >>confdefs.h <<\_ACEOF
--#define STAT_ST_BLOCKSIZE 512
--_ACEOF
-+ $as_echo "#define STAT_ST_BLOCKSIZE 512" >>confdefs.h
-
- ;;
*osf*)
-cat >>confdefs.h <<\_ACEOF
-#define OSF1 1
@@ -59213,7 +58805,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ROFF"; then
-@@ -51902,91 +18188,71 @@
+@@ -51747,91 +18015,71 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -59320,7 +58912,7 @@
BLDSHARED="true"
LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -52000,16 +18266,12 @@
+@@ -51845,16 +18093,12 @@
# actually support the PIE stuff.
PIE_LDFLAGS=
PIE_CFLAGS=
@@ -59339,7 +58931,7 @@
;;
esac
-@@ -52026,53 +18288,53 @@
+@@ -51871,19 +18115,15 @@
LDFLAGS="$LDFLAGS -L./bin"
fi
@@ -59347,6 +58939,141 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLDSHARED" >&5
$as_echo "$BLDSHARED" >&6; }
+ for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
+ saved_ldflags="$LDFLAGS"
+- { $as_echo "$as_me:$LINENO: checking if $flags works" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
+ $as_echo_n "checking if $flags works... " >&6; }
+ LDFLAGS="$flags $saved_ldflags"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -51894,42 +18134,17 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ LD_AS_NEEDED_FLAG=$flags
+ ld_as_needed_flag_found=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
+ test x"$ld_as_needed_flag_found" = xyes && break
+ done
+@@ -51942,14 +18157,10 @@
+
+ for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
+ saved_ldflags="$LDFLAGS"
+- { $as_echo "$as_me:$LINENO: checking if $flags works" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
+ $as_echo_n "checking if $flags works... " >&6; }
+ LDFLAGS="$flags $saved_ldflags"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -51960,94 +18171,69 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ LDSHFLAGS_Z_DEFS=$flags
+ ldshflags_z_defs_found=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$saved_ldflags
+ test x"$ldshflags_z_defs_found" = xyes && break
+ done
+
+-{ $as_echo "$as_me:$LINENO: checking LDSHFLAGS_Z_DEFS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDSHFLAGS_Z_DEFS" >&5
+ $as_echo_n "checking LDSHFLAGS_Z_DEFS... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $LDSHFLAGS_Z_DEFS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDSHFLAGS_Z_DEFS" >&5
+ $as_echo "$LDSHFLAGS_Z_DEFS" >&6; }
-{ $as_echo "$as_me:$LINENO: checking LDFLAGS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDFLAGS" >&5
$as_echo_n "checking LDFLAGS... " >&6; }
@@ -59412,7 +59139,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -52088,7 +18350,7 @@
+@@ -52063,7 +18249,7 @@
fi
@@ -59421,8 +59148,8 @@
$as_echo "$ac_cv_shlib_works" >&6; }
if test $ac_cv_shlib_works = no; then
BLDSHARED=false
-@@ -52104,9 +18366,9 @@
- SHLIBEXT="shared_libraries_disabled"
+@@ -52080,9 +18266,9 @@
+ merged_build_possible=no
fi
-{ $as_echo "$as_me:$LINENO: checking used PICFLAG" >&5
@@ -59433,8 +59160,1845 @@
$as_echo "$PICFLAG" >&6; }
-@@ -52148,165 +18410,39 @@
+@@ -52154,10 +18340,10 @@
+ USESHARED=false
+
+-{ $as_echo "$as_me:$LINENO: checking whether to use shared libraries internally" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use shared libraries internally" >&5
+ $as_echo_n "checking whether to use shared libraries internally... " >&6; }
+ # Check whether --enable-shared-libs was given.
+-if test "${enable_shared_libs+set}" = set; then
++if test "${enable_shared_libs+set}" = set; then :
+ enableval=$enable_shared_libs; enable_shared_libs=$enableval
+ else
+ enable_shared_libs=yes
+@@ -52168,11 +18354,11 @@
+ USESHARED=$BLDSHARED
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $USESHARED" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USESHARED" >&5
+ $as_echo "$USESHARED" >&6; }
+
+ if test x"$enable_shared_libs" = x"yes" -a x"$BLDSHARED" != x"true" ; then
+- { $as_echo "$as_me:$LINENO: WARNING: --enable-shared-libs: no support for shared libraries" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-shared-libs: no support for shared libraries" >&5
+ $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
+ fi
+
+@@ -52200,14 +18386,13 @@
+
+
+ # Check whether --with-static-libs was given.
+-if test "${with_static_libs+set}" = set; then
+- withval=$with_static_libs; if test $withval; then
++if test "${with_static_libs+set}" = set; then :
++ withval=$with_static_libs; if test $withval; then :
+ for lib in `echo $withval | sed -e 's/,/ /g'` ; do
+ lib=`echo $lib | tr '[a-z]' '[A-Z]'`
+ eval LINK_$lib=STATIC
+ done
+ fi
+-
+ fi
+
+
+@@ -52229,7 +18414,7 @@
+ # be extracted from their respective source directories
+ #
+ # Check whether --enable-external_libtalloc was given.
+-if test "${enable_external_libtalloc+set}" = set; then
++if test "${enable_external_libtalloc+set}" = set; then :
+ enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval
+ else
+ enable_external_libtalloc=auto
+@@ -52244,9 +18429,9 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -52259,14 +18444,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -52274,10 +18459,10 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -52287,9 +18472,9 @@
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+@@ -52302,14 +18487,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -52317,10 +18502,10 @@
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++ { $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:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -52329,7 +18514,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $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
+@@ -52342,13 +18527,13 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++ { $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:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+@@ -52356,7 +18541,7 @@
+ fi
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBTALLOC" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTALLOC" >&5
+ $as_echo_n "checking for LIBTALLOC... " >&6; }
+
+ if test -n "$PKG_CONFIG"; then
+@@ -52364,11 +18549,11 @@
+ pkg_cv_LIBTALLOC_CFLAGS="$LIBTALLOC_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.1") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -52382,11 +18567,11 @@
+ pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.1") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -52413,768 +18598,112 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBTALLOC_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if test x$enable_external_libtalloc = xyes; then
+- { { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
+-$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- enable_external_libtalloc=no
+- fi
+-
+-elif test $pkg_failed = untried; then
+- if test x$enable_external_libtalloc = xyes; then
+- { { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
+-$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Unable to find libtalloc" "$LINENO" 5
++ else
++ enable_external_libtalloc=no
++ fi
++
++elif test $pkg_failed = untried; then
++ if test x$enable_external_libtalloc = xyes; then
++ as_fn_error "Unable to find libtalloc" "$LINENO" 5
+ else
+ enable_external_libtalloc=no
+ fi
+
+ else
+- LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
+- LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- enable_external_libtalloc=yes
+-fi
+-fi
+-
+-if test "x$enable_external_libtalloc" = xno
+-then
+- tallocdir=""
+-tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
+-for d in $tallocpaths; do
+- if test -f "$srcdir/$d/talloc.c"; then
+- tallocdir="$d"
+-
+- break;
+- fi
+-done
+-if test x"$tallocdir" = "x"; then
+- { { $as_echo "$as_me:$LINENO: error: cannot find talloc source in $tallocpaths" >&5
+-$as_echo "$as_me: error: cannot find talloc source in $tallocpaths" >&2;}
+- { (exit 1); exit 1; }; }
+-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:$LINENO: checking size of size_t" >&5
+-$as_echo_n "checking size of size_t... " >&6; }
+-if test "${ac_cv_sizeof_size_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=$ac_mid; break
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_lo=$ac_mid; break
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_lo= ac_hi=
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=$ac_mid
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') if test "$ac_cv_type_size_t" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
+- else
+- ac_cv_sizeof_size_t=0
+- fi ;;
+-esac
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (size_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- return 1;
+- if (((long int) (sizeof (size_t))) < 0)
+- {
+- long int i = longval ();
+- if (i != ((long int) (sizeof (size_t))))
+- return 1;
+- fprintf (f, "%ld", i);
+- }
+- else
+- {
+- unsigned long int i = ulongval ();
+- if (i != ((long int) (sizeof (size_t))))
+- return 1;
+- fprintf (f, "%lu", i);
+- }
+- /* Do not output a trailing newline, as this causes \r\n confusion
+- on some platforms. */
+- return ferror (f) || fclose (f) != 0;
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_sizeof_size_t=`cat conftest.val`
+-else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-if test "$ac_cv_type_size_t" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
+- else
+- ac_cv_sizeof_size_t=0
+- fi
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.val
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
+-$as_echo_n "checking size of void *... " >&6; }
+-if test "${ac_cv_sizeof_void_p+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=$ac_mid; break
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
++ LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ enable_external_libtalloc=yes
++fi
++fi
+
+- ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++if test "x$enable_external_libtalloc" = xno
++then
++ tallocdir=""
++tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
++for d in $tallocpaths; do
++ if test -f "$srcdir/$d/talloc.c"; then
++ tallocdir="$d"
++
++ break;
++ fi
++done
++if test x"$tallocdir" = "x"; then
++ as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
+ fi
++TALLOC_OBJ="talloc.o"
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
+-test_array [0] = 0
++TALLOC_CFLAGS="-I$srcdir/$tallocdir"
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
+-test_array [0] = 0
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_lo=$ac_mid; break
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++TALLOC_LIBS=""
+
+- ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
+-fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
++$as_echo_n "checking size of size_t... " >&6; }
++if test "${ac_cv_sizeof_size_t+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
+
+- ac_lo= ac_hi=
++else
++ if test "$ac_cv_type_size_t" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ 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_size_t=0
++ fi
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
++$as_echo "$ac_cv_sizeof_size_t" >&6; }
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_hi=$ac_mid
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_void_p=$ac_lo;;
+-'') if test "$ac_cv_type_void_p" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
+- else
+- ac_cv_sizeof_void_p=0
+- fi ;;
+-esac
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (void *)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- return 1;
+- if (((long int) (sizeof (void *))) < 0)
+- {
+- long int i = longval ();
+- if (i != ((long int) (sizeof (void *))))
+- return 1;
+- fprintf (f, "%ld", i);
+- }
+- else
+- {
+- unsigned long int i = ulongval ();
+- if (i != ((long int) (sizeof (void *))))
+- return 1;
+- fprintf (f, "%lu", i);
+- }
+- /* Do not output a trailing newline, as this causes \r\n confusion
+- on some platforms. */
+- return ferror (f) || fclose (f) != 0;
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_sizeof_void_p=`cat conftest.val`
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
++$as_echo_n "checking size of void *... " >&6; }
++if test "${ac_cv_sizeof_void_p+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
+
+-( exit $ac_status )
+-if test "$ac_cv_type_void_p" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++else
++ if test "$ac_cv_type_void_p" = yes; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
++{ 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
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.val
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+ $as_echo "$ac_cv_sizeof_void_p" >&6; }
+
+
+@@ -53186,17 +18715,15 @@
+
+
+ if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
+- { $as_echo "$as_me:$LINENO: WARNING: size_t cannot represent the amount of used memory of a process" >&5
++ { $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:$LINENO: WARNING: please report this to <samba-technical at samba.org>" >&5
++ { $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:$LINENO: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
++ { $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:$LINENO: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
++ { $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_echo "$as_me:$LINENO: error: sizeof(size_t) < sizeof(void *)" >&5
+-$as_echo "$as_me: error: sizeof(size_t) < sizeof(void *)" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
+ fi
+
+ if test x"$VERSIONSCRIPT" != "x"; then
+@@ -53231,16 +18758,16 @@
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtalloc shared library" >&5
+ $as_echo_n "checking whether to build the libtalloc shared library... " >&6; }
+
+
+ # Check whether --with-libtalloc was given.
+-if test "${with_libtalloc+set}" = set; then
++if test "${with_libtalloc+set}" = set; then :
+ withval=$with_libtalloc;
+ case "$withval" in
+ no)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+ ;;
+@@ -53266,7 +18793,7 @@
+ if eval $BLDSHARED = true; then
+ LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
+ LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
+ enable_static=yes
+@@ -53279,12 +18806,12 @@
+ enable_static=yes
+ LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
+ LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
+- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ fi
+ else
+ enable_static=yes
+- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -53310,7 +18837,7 @@
+
+
+ # Check whether --enable-external_libtdb was given.
+-if test "${enable_external_libtdb+set}" = set; then
++if test "${enable_external_libtdb+set}" = set; then :
+ enableval=$enable_external_libtdb; enable_external_libtalloc=$enableval
+ else
+ enable_external_libtalloc=auto
+@@ -53321,7 +18848,7 @@
+ then
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBTDB" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTDB" >&5
+ $as_echo_n "checking for LIBTDB... " >&6; }
+
+ if test -n "$PKG_CONFIG"; then
+@@ -53329,11 +18856,11 @@
+ pkg_cv_LIBTDB_CFLAGS="$LIBTDB_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tdb >= 1.1.7") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.1.7" 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -53347,11 +18874,11 @@
+ pkg_cv_LIBTDB_LIBS="$LIBTDB_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.1.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tdb >= 1.1.7") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.1.7" 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -53378,13 +18905,11 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBTDB_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+
+ if test x$enable_external_libtdb = xyes; then
+- { { $as_echo "$as_me:$LINENO: error: Unable to find libtdb" >&5
+-$as_echo "$as_me: error: Unable to find libtdb" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Unable to find libtdb" "$LINENO" 5
+ else
+ enable_external_libtdb=no
+ fi
+@@ -53392,9 +18917,7 @@
+ elif test $pkg_failed = untried; then
+
+ if test x$enable_external_libtdb = xyes; then
+- { { $as_echo "$as_me:$LINENO: error: Unable to find libtdb" >&5
+-$as_echo "$as_me: error: Unable to find libtdb" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Unable to find libtdb" "$LINENO" 5
+ else
+ enable_external_libtdb=no
+ fi
+@@ -53402,7 +18925,7 @@
+ else
+ LIBTDB_CFLAGS=$pkg_cv_LIBTDB_CFLAGS
+ LIBTDB_LIBS=$pkg_cv_LIBTDB_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ enable_external_libtdb=yes
+ fi
+@@ -53421,9 +18944,7 @@
+ fi
+ done
+ if test x"$tdbdir" = "x"; then
+- { { $as_echo "$as_me:$LINENO: error: cannot find tdb source in $tdbpaths" >&5
+-$as_echo "$as_me: error: cannot find tdb source in $tdbpaths" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "cannot find tdb source in $tdbpaths" "$LINENO" 5
+ fi
+ TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
+ TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
+@@ -53436,104 +18957,12 @@
+ TDB_CFLAGS="-I$tdbdir/include"
+
+
+-
+-
+-
+-
+-
+ for ac_func in mmap pread pwrite getpagesize utime
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -53541,151 +18970,12 @@
+ fi
+ done
+
+-
+-
+-
+ for ac_header in getopt.h sys/select.h sys/time.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -53696,17 +18986,13 @@
+
+
+
+- { $as_echo "$as_me:$LINENO: checking for pread declaration" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pread declaration" >&5
+ $as_echo_n "checking for pread declaration... " >&6; }
+-if test "${ac_cv_have_pread_decl+set}" = set; then
++if test "${ac_cv_have_pread_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <unistd.h>
+ int
+@@ -53717,56 +19003,29 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_have_pread_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_have_pread_decl=no
++ ac_cv_have_pread_decl=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_pread_decl" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pread_decl" >&5
+ $as_echo "$ac_cv_have_pread_decl" >&6; }
+ if test x"$ac_cv_have_pread_decl" = x"yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PREAD_DECL 1
+-_ACEOF
++$as_echo "#define HAVE_PREAD_DECL 1" >>confdefs.h
+
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking for pwrite declaration" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pwrite declaration" >&5
+ $as_echo_n "checking for pwrite declaration... " >&6; }
+-if test "${ac_cv_have_pwrite_decl+set}" = set; then
++if test "${ac_cv_have_pwrite_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <unistd.h>
+ int
+@@ -53777,41 +19036,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_have_pwrite_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_have_pwrite_decl=no
++ ac_cv_have_pwrite_decl=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_pwrite_decl" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pwrite_decl" >&5
+ $as_echo "$ac_cv_have_pwrite_decl" >&6; }
+ if test x"$ac_cv_have_pwrite_decl" = x"yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PWRITE_DECL 1
+-_ACEOF
++$as_echo "#define HAVE_PWRITE_DECL 1" >>confdefs.h
+
+ fi
+
+@@ -53848,16 +19084,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; }
+
+
+ # Check whether --with-libtdb was given.
+-if test "${with_libtdb+set}" = set; then
++if test "${with_libtdb+set}" = set; then :
+ withval=$with_libtdb;
+ case "$withval" in
+ no)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+ ;;
+@@ -53883,7 +19119,7 @@
+ if eval $BLDSHARED = true; then
+ LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
+ LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
+ enable_static=yes
+@@ -53896,12 +19132,12 @@
+ enable_static=yes
+ LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
+ LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
+- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ fi
+ else
+ enable_static=yes
+- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -53957,16 +19193,16 @@
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libnetapi shared library" >&5
+ $as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
+
+
+ # Check whether --with-libnetapi was given.
+-if test "${with_libnetapi+set}" = set; then
++if test "${with_libnetapi+set}" = set; then :
+ withval=$with_libnetapi;
+ case "$withval" in
+ no)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+ ;;
+@@ -53992,7 +19228,7 @@
+ if eval $BLDSHARED = true; then
+ LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
+ LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
+ enable_static=yes
+@@ -54005,12 +19241,12 @@
+ enable_static=yes
+ LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
+ LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
+- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ fi
+ else
+ enable_static=yes
+- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54048,16 +19284,16 @@
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbclient shared library" >&5
+ $as_echo_n "checking whether to build the libsmbclient shared library... " >&6; }
+
+
+ # Check whether --with-libsmbclient was given.
+-if test "${with_libsmbclient+set}" = set; then
++if test "${with_libsmbclient+set}" = set; then :
+ withval=$with_libsmbclient;
+ case "$withval" in
+ no)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+ ;;
+@@ -54083,7 +19319,7 @@
+ if eval $BLDSHARED = true; then
+ LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
+ LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
+ enable_static=yes
+@@ -54096,12 +19332,12 @@
+ enable_static=yes
+ LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
+ LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
+- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ fi
+ else
+ enable_static=yes
+- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54139,16 +19375,16 @@
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbsharemodes shared library" >&5
+ $as_echo_n "checking whether to build the libsmbsharemodes shared library... " >&6; }
+
+
+ # Check whether --with-libsmbsharemodes was given.
+-if test "${with_libsmbsharemodes+set}" = set; then
++if test "${with_libsmbsharemodes+set}" = set; then :
+ withval=$with_libsmbsharemodes;
+ case "$withval" in
+ no)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+ ;;
+@@ -54174,7 +19410,7 @@
+ if eval $BLDSHARED = true; then
+ LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
+ LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
+ enable_static=yes
+@@ -54187,12 +19423,12 @@
+ enable_static=yes
+ LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
+ LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
+- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ fi
+ else
+ enable_static=yes
+- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54230,19 +19466,19 @@
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libaddns shared library" >&5
+ $as_echo_n "checking whether to build the libaddns shared library... " >&6; }
+
+
+ # Check whether --with-libaddns was given.
+-if test "${with_libaddns+set}" = set; then
++if test "${with_libaddns+set}" = set; then :
+ withval=$with_libaddns;
+ case "$withval" in
+ yes)
+ build_lib=yes
+ ;;
+ *)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+ ;;
+@@ -54251,7 +19487,7 @@
+ else
+
+ # if unspecified, default is not to build
+-{ $as_echo "$as_me:$LINENO: result: no" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+
+@@ -54267,7 +19503,7 @@
+ if eval $BLDSHARED = true; then
+ LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
+ LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
+ enable_static=yes
+@@ -54280,12 +19516,12 @@
+ enable_static=yes
+ LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
+ LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
+- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ fi
+ else
+ enable_static=yes
+- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54302,165 +19538,39 @@
+
################
-{ $as_echo "$as_me:$LINENO: checking for long long" >&5
@@ -59611,7 +61175,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -52316,102 +18452,9 @@
+@@ -54470,102 +19580,9 @@
fi
else
@@ -59702,11 +61266,11 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--
--fi
+ ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = x""yes; then :
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
@@ -59716,7 +61280,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -52426,17 +18469,13 @@
+@@ -54580,17 +19597,13 @@
# Check if the compiler supports the LL prefix on long long integers.
# AIX needs this.
@@ -59737,7 +61301,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -52447,190 +18486,97 @@
+@@ -54601,190 +19614,97 @@
return 0;
}
_ACEOF
@@ -59956,7 +61520,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52640,67 +18586,34 @@
+@@ -54794,67 +19714,34 @@
#include <sys/stat.h>
main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
_ACEOF
@@ -60034,7 +61598,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52710,67 +18623,34 @@
+@@ -54864,67 +19751,34 @@
#include <sys/stat.h>
main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
_ACEOF
@@ -60112,7 +61676,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52780,67 +18660,34 @@
+@@ -54934,67 +19788,34 @@
#include <sys/stat.h>
main() { struct stat64 st; ino64_t s; if (sizeof(ino_t) == sizeof(ino64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
_ACEOF
@@ -60190,7 +61754,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52850,134 +18697,68 @@
+@@ -55004,67 +19825,34 @@
#include <sys/stat.h>
main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
_ACEOF
@@ -60268,12 +61832,10 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
- #include <unistd.h>
--#endif
--#include <stdio.h>
--#include <sys/stat.h>
--main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
--_ACEOF
+@@ -55074,64 +19862,31 @@
+ #include <sys/stat.h>
+ main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
+ _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -60296,11 +61858,6 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+#endif
-+#include <stdio.h>
-+#include <sys/stat.h>
-+main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
-+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
samba_cv_HAVE_DEV64_T=yes
else
@@ -60349,7 +61906,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52993,55 +18774,28 @@
+@@ -55147,55 +19902,28 @@
return 0;
}
_ACEOF
@@ -60412,7 +61969,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53057,58 +18811,31 @@
+@@ -55211,58 +19939,31 @@
return 0;
}
_ACEOF
@@ -60479,7 +62036,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53117,67 +18844,34 @@
+@@ -55271,67 +19972,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = major(dev); return 0; }
_ACEOF
@@ -60557,7 +62114,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53186,67 +18880,34 @@
+@@ -55340,67 +20008,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = minor(dev); return 0; }
_ACEOF
@@ -60635,7 +62192,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53255,129 +18916,63 @@
+@@ -55409,129 +20044,63 @@
#include <sys/types.h>
main() { dev_t dev = makedev(1,2); return 0; }
_ACEOF
@@ -60784,7 +62341,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -53390,55 +18985,28 @@
+@@ -55544,55 +20113,28 @@
return 0;
}
_ACEOF
@@ -60847,7 +62404,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -53449,55 +19017,28 @@
+@@ -55603,55 +20145,28 @@
return 0;
}
_ACEOF
@@ -60910,7 +62467,7 @@
/* end confdefs.h. */
#include <sys/time.h>
-@@ -53510,46 +19051,19 @@
+@@ -55664,46 +20179,19 @@
return 0;
}
_ACEOF
@@ -60963,7 +62520,7 @@
fi
-@@ -53561,120 +19075,24 @@
+@@ -55715,120 +20203,24 @@
# which rely on signals.
@@ -61092,7 +62649,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53698,58 +19116,27 @@
+@@ -55852,58 +20244,27 @@
return 0;
}
_ACEOF
@@ -61159,7 +62716,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53773,58 +19160,27 @@
+@@ -55927,58 +20288,27 @@
return 0;
}
_ACEOF
@@ -61226,7 +62783,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53848,49 +19204,22 @@
+@@ -56002,49 +20332,22 @@
return 0;
}
_ACEOF
@@ -61282,7 +62839,7 @@
-@@ -53908,18 +19237,14 @@
+@@ -56062,18 +20365,14 @@
;;
*)
# clock_gettime was not found, try adding librt
@@ -61304,7 +62861,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -53937,60 +19262,29 @@
+@@ -56091,60 +20390,29 @@
return 0;
}
_ACEOF
@@ -61374,7 +62931,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54014,58 +19308,27 @@
+@@ -56168,58 +20436,27 @@
return 0;
}
_ACEOF
@@ -61441,7 +62998,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54089,58 +19352,27 @@
+@@ -56243,58 +20480,27 @@
return 0;
}
_ACEOF
@@ -61508,7 +63065,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54164,49 +19396,22 @@
+@@ -56318,49 +20524,22 @@
return 0;
}
_ACEOF
@@ -61564,7 +63121,7 @@
-@@ -54231,20 +19436,16 @@
+@@ -56385,20 +20564,16 @@
fi
@@ -61589,7 +63146,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -54252,64 +19453,31 @@
+@@ -56406,216 +20581,67 @@
if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
di->d_name[0] == 0) exit(0); exit(1);}
_ACEOF
@@ -61663,10 +63220,14 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utime.h>
-@@ -54321,41 +19489,18 @@
- return 0;
- }
- _ACEOF
+ int
+ main ()
+ {
+-struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -61685,40 +63246,37 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- samba_cv_HAVE_UTIMBUF=yes
- else
+- samba_cv_HAVE_UTIMBUF=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_UTIMBUF=no
-+ samba_cv_HAVE_UTIMBUF=no
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UTIMBUF" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_UTIMBUF" >&5
- $as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
- if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
-
+-$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
+-if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UTIMBUF 1
-_ACEOF
-+$as_echo "#define HAVE_UTIMBUF 1" >>confdefs.h
-
- fi
-
-@@ -54363,104 +19508,12 @@
- # Check utmp details, but only if our OS offers utmp.h
- if test x"$ac_cv_header_utmp_h" = x"yes"; then
-
-
+-fi
-
+-##############
+-# Check utmp details, but only if our OS offers utmp.h
+-if test x"$ac_cv_header_utmp_h" = x"yes"; then
-
-
-
- for ac_func in pututline pututxline updwtmp updwtmpx getutmpx
+-
+-
+-
+-
+-for ac_func in pututline pututxline updwtmp updwtmpx getutmpx getutxent
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -61767,10 +63325,11 @@
-main ()
-{
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -61793,17 +63352,27 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ samba_cv_HAVE_UTIMBUF=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
--
++ samba_cv_HAVE_UTIMBUF=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_UTIMBUF" >&5
++$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
++if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
++
++$as_echo "#define HAVE_UTIMBUF 1" >>confdefs.h
+
-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
@@ -61811,6 +63380,12 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++##############
++# Check utmp details, but only if our OS offers utmp.h
++if test x"$ac_cv_header_utmp_h" = x"yes"; then
++
++for ac_func in pututline pututxline updwtmp updwtmpx getutmpx getutxent
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -61819,7 +63394,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -54469,17 +19522,13 @@
+@@ -56624,17 +20650,13 @@
done
@@ -61840,7 +63415,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54491,55 +19540,28 @@
+@@ -56646,55 +20668,28 @@
return 0;
}
_ACEOF
@@ -61903,7 +63478,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54551,55 +19573,28 @@
+@@ -56706,55 +20701,28 @@
return 0;
}
_ACEOF
@@ -61966,7 +63541,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54611,55 +19606,28 @@
+@@ -56766,55 +20734,28 @@
return 0;
}
_ACEOF
@@ -62029,7 +63604,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54671,55 +19639,28 @@
+@@ -56826,55 +20767,28 @@
return 0;
}
_ACEOF
@@ -62092,7 +63667,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54731,55 +19672,28 @@
+@@ -56886,55 +20800,28 @@
return 0;
}
_ACEOF
@@ -62155,7 +63730,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54791,55 +19705,28 @@
+@@ -56946,55 +20833,28 @@
return 0;
}
_ACEOF
@@ -62218,7 +63793,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54851,55 +19738,28 @@
+@@ -57006,55 +20866,28 @@
return 0;
}
_ACEOF
@@ -62281,7 +63856,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54911,55 +19771,28 @@
+@@ -57066,55 +20899,28 @@
return 0;
}
_ACEOF
@@ -62344,7 +63919,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54971,55 +19804,28 @@
+@@ -57126,55 +20932,28 @@
return 0;
}
_ACEOF
@@ -62407,7 +63982,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55031,55 +19837,28 @@
+@@ -57186,55 +20965,28 @@
return 0;
}
_ACEOF
@@ -62470,7 +64045,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55091,56 +19870,29 @@
+@@ -57246,56 +20998,29 @@
return 0;
}
_ACEOF
@@ -62534,7 +64109,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55152,56 +19904,29 @@
+@@ -57307,56 +21032,29 @@
return 0;
}
_ACEOF
@@ -62598,7 +64173,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmpx.h>
-@@ -55213,41 +19938,18 @@
+@@ -57368,41 +21066,18 @@
return 0;
}
_ACEOF
@@ -62644,7 +64219,7 @@
fi
-@@ -55258,12 +19960,10 @@
+@@ -57413,12 +21088,10 @@
ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
# Check whether --with-libiconv was given.
@@ -62659,7 +64234,7 @@
else
if test "$withval" != "yes" ; then
ICONV_PATH_SPEC=yes
-@@ -55309,7 +20009,7 @@
+@@ -57464,7 +21137,7 @@
export LDFLAGS LIBS CPPFLAGS
# Try to find iconv(3)
@@ -62668,20 +64243,20 @@
$as_echo_n "checking for iconv in $i/$l... " >&6; }
jm_cv_func_iconv="no"
jm_cv_lib_iconv=""
-@@ -55317,11 +20017,7 @@
+@@ -57472,11 +21145,7 @@
jm_save_LIBS="$LIBS"
- if test "$jm_cv_func_iconv" != yes; then
-- cat >conftest.$ac_ext <<_ACEOF
+ if test "$jm_cv_func_iconv" != yes; then
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -55335,48 +20031,17 @@
+@@ -57490,48 +21159,17 @@
return 0;
}
_ACEOF
@@ -62708,9 +64283,9 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
jm_cv_func_iconv=yes
- jm_cv_include="giconv.h"
- jm_cv_giconv="yes"
- jm_cv_lib_iconv=""
+ jm_cv_include="giconv.h"
+ jm_cv_giconv="yes"
+ jm_cv_lib_iconv=""
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -62724,17 +64299,17 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- if test "$jm_cv_func_iconv" != yes; then
-- cat >conftest.$ac_ext <<_ACEOF
+ if test "$jm_cv_func_iconv" != yes; then
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -55390,49 +20055,18 @@
+@@ -57545,49 +21183,18 @@
return 0;
}
_ACEOF
@@ -62761,8 +64336,8 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
jm_cv_include="iconv.h"
- jm_cv_func_iconv=yes
- jm_cv_lib_iconv=""
+ jm_cv_func_iconv=yes
+ jm_cv_lib_iconv=""
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -62776,19 +64351,19 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- if test "$jm_cv_lib_iconv" != yes; then
- jm_save_LIBS="$LIBS"
- LIBS="$LIBS -lgiconv"
-- cat >conftest.$ac_ext <<_ACEOF
+ if test "$jm_cv_func_iconv" != yes; then
+ jm_save_LIBS="$LIBS"
+ LIBS="$LIBS -lgiconv"
+- 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. */
#include <stdlib.h>
#include <giconv.h>
-@@ -55446,53 +20080,22 @@
+@@ -57601,53 +21208,22 @@
return 0;
}
_ACEOF
@@ -62815,10 +64390,10 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
jm_cv_lib_iconv=yes
- jm_cv_func_iconv=yes
- jm_cv_include="giconv.h"
- jm_cv_giconv=yes
- jm_cv_lib_iconv="giconv"
+ jm_cv_func_iconv=yes
+ jm_cv_include="giconv.h"
+ jm_cv_giconv=yes
+ jm_cv_lib_iconv="giconv"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -62832,9 +64407,9 @@
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$jm_save_LIBS"
+ LIBS="$jm_save_LIBS"
- if test "$jm_cv_func_iconv" != yes; then
+ if test "$jm_cv_func_iconv" != yes; then
jm_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
- cat >conftest.$ac_ext <<_ACEOF
@@ -62846,7 +64421,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -55506,50 +20109,19 @@
+@@ -57661,50 +21237,19 @@
return 0;
}
_ACEOF
@@ -62889,7 +64464,7 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$jm_save_LIBS"
- if test "$jm_cv_lib_iconv" != yes; then
+ if test "$jm_cv_func_iconv" != yes; then
jm_save_LIBS="$LIBS"
LIBS="$LIBS -lbiconv"
- cat >conftest.$ac_ext <<_ACEOF
@@ -62901,7 +64476,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <biconv.h>
-@@ -55563,42 +20135,15 @@
+@@ -57718,42 +21263,15 @@
return 0;
}
_ACEOF
@@ -62946,8 +64521,8 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$jm_save_LIBS"
- fi
-@@ -55609,36 +20154,30 @@
+ fi
+@@ -57764,36 +21282,30 @@
if test "$jm_cv_func_iconv" = yes; then
if test "$jm_cv_giconv" = yes; then
@@ -62991,7 +64566,7 @@
$as_echo "no" >&6; }
fi
-@@ -55676,16 +20215,12 @@
+@@ -57831,16 +21343,12 @@
# check for default dos charset name
for j in CP850 IBM850 ; do
@@ -63011,7 +64586,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55698,43 +20233,16 @@
+@@ -57853,43 +21361,16 @@
}
_ACEOF
@@ -63060,7 +64635,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_dos_charset="$ICONV_CHARSET"
-@@ -55746,16 +20254,12 @@
+@@ -57901,16 +21382,12 @@
# check for default display charset name
for j in ASCII 646 ; do
@@ -63080,7 +64655,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55768,43 +20272,16 @@
+@@ -57923,43 +21400,16 @@
}
_ACEOF
@@ -63129,7 +64704,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_display_charset="$ICONV_CHARSET"
-@@ -55816,16 +20293,12 @@
+@@ -57971,16 +21421,12 @@
# check for default unix charset name
for j in UTF-8 UTF8 ; do
@@ -63149,7 +64724,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55838,43 +20311,16 @@
+@@ -57993,43 +21439,16 @@
}
_ACEOF
@@ -63198,7 +64773,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_unix_charset="$ICONV_CHARSET"
-@@ -55913,9 +20359,9 @@
+@@ -58068,9 +21487,9 @@
default_display_charset="ASCII"
default_unix_charset="UTF-8"
samba_cv_HAVE_NATIVE_ICONV=yes
@@ -63210,7 +64785,7 @@
$as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
fi
-@@ -55939,9 +20385,7 @@
+@@ -58094,9 +21513,7 @@
default_unix_charset="\"$default_unix_charset\""
@@ -63221,7 +64796,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -55975,7 +20419,7 @@
+@@ -58130,7 +21547,7 @@
if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -63230,7 +64805,7 @@
Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&5
$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&2;}
-@@ -55997,20 +20441,16 @@
+@@ -58152,20 +21569,16 @@
fi
@@ -63255,7 +64830,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -56024,67 +20464,34 @@
+@@ -58179,67 +21592,34 @@
}
_ACEOF
@@ -63333,10 +64908,16 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -56098,204 +20505,36 @@
- }
-
- _ACEOF
+@@ -58247,331 +21627,69 @@
+ #include <signal.h>
+ #ifndef F_NOTIFY
+ #define F_NOTIFY 1026
+-#endif
+-main() {
+- exit(fcntl(open("/tmp", O_RDONLY), F_NOTIFY, 0) == -1 ? 1 : 0);
+-}
+-
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -63359,49 +64940,41 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
- else
+- samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no
-+ samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=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: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
- $as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
- if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
-
+-$as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
+-if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KERNEL_CHANGE_NOTIFY 1
-_ACEOF
-+$as_echo "#define HAVE_KERNEL_CHANGE_NOTIFY 1" >>confdefs.h
-
- fi
-
+-
+-fi
+-
-{ $as_echo "$as_me:$LINENO: checking for inotify support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify support" >&5
- $as_echo_n "checking for inotify support... " >&6; }
+-$as_echo_n "checking for inotify support... " >&6; }
-if test "${samba_cv_HAVE_INOTIFY+set}" = set; then
-+if test "${samba_cv_HAVE_INOTIFY+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-
+- $as_echo_n "(cached) " >&6
+-else
-
-
-
- for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
+-
+-for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -63543,20 +65116,16 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -56304,119 +20543,25 @@
-
- done
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
-
- for ac_func in inotify_init
+-fi
+-
+-done
+-
+-
+-for ac_func in inotify_init
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -63607,8 +65176,12 @@
-return $ac_func ();
- ;
- return 0;
--}
--_ACEOF
++#endif
++main() {
++ exit(fcntl(open("/tmp", O_RDONLY), F_NOTIFY, 0) == -1 ? 1 : 0);
+ }
++
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -63631,17 +65204,29 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no
++fi
++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
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
++$as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
++if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
++
++$as_echo "#define HAVE_KERNEL_CHANGE_NOTIFY 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
@@ -63649,11 +65234,33 @@
-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}: checking for inotify support" >&5
++$as_echo_n "checking for inotify support... " >&6; }
++if test "${samba_cv_HAVE_INOTIFY+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
+do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++for ac_func in inotify_init
++do :
+ ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
+if test "x$ac_cv_func_inotify_init" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_INOTIFY_INIT 1
_ACEOF
@@ -63678,7 +65285,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -56427,54 +20572,29 @@
+@@ -58582,54 +21700,29 @@
return 0;
}
_ACEOF
@@ -63739,7 +65346,7 @@
fi
-@@ -56483,157 +20603,18 @@
+@@ -58638,157 +21731,18 @@
# http://oss.sgi.com/projects/fam/
# http://savannah.nongnu.org/projects/fam/
# Check whether --enable-fam was given.
@@ -63903,7 +65510,7 @@
_ACEOF
samba_cv_HAVE_FAM_H=yes
else
-@@ -56645,18 +20626,14 @@
+@@ -58800,18 +21754,14 @@
if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then
# On IRIX, libfam requires libC, but other FAM implementations
# might not need it.
@@ -63925,7 +65532,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56674,43 +20651,18 @@
+@@ -58829,43 +21779,18 @@
return 0;
}
_ACEOF
@@ -63975,7 +65582,7 @@
samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
else
samba_cv_HAVE_LIBFAM=no
-@@ -56721,23 +20673,17 @@
+@@ -58876,23 +21801,17 @@
samba_fam_xtra=-lC
@@ -64002,7 +65609,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56755,72 +20701,41 @@
+@@ -58910,72 +21829,41 @@
return 0;
}
_ACEOF
@@ -64083,7 +65690,7 @@
/* end confdefs.h. */
#include <fam.h>
int
-@@ -56831,43 +20746,16 @@
+@@ -58986,43 +21874,16 @@
return 0;
}
_ACEOF
@@ -64130,7 +65737,7 @@
fi
fi
-@@ -56880,18 +20768,14 @@
+@@ -59035,18 +21896,14 @@
samba_dmapi_libs=""
if test x"$samba_dmapi_libs" = x"" ; then
@@ -64152,7 +65759,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56909,61 +20793,32 @@
+@@ -59064,61 +21921,32 @@
return 0;
}
_ACEOF
@@ -64223,7 +65830,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56981,61 +20836,32 @@
+@@ -59136,61 +21964,32 @@
return 0;
}
_ACEOF
@@ -64276,15 +65883,15 @@
fi
if test x"$samba_dmapi_libs" = x"" ; then
-- { $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -lxdsm" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -lxdsm" >&5
- $as_echo_n "checking for dm_get_eventlist in -lxdsm... " >&6; }
--if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then
-+if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then :
+- { $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -ldmapi" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -ldmapi" >&5
+ $as_echo_n "checking for dm_get_eventlist in -ldmapi... " >&6; }
+-if test "${ac_cv_lib_dmapi_dm_get_eventlist+set}" = set; then
++if test "${ac_cv_lib_dmapi_dm_get_eventlist+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
- LIBS="-lxdsm $LIBS"
+ LIBS="-ldmapi $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -64294,7 +65901,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57053,61 +20879,32 @@
+@@ -59208,61 +22007,32 @@
return 0;
}
_ACEOF
@@ -64320,13 +65927,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_xdsm_dm_get_eventlist=yes
+ ac_cv_lib_dmapi_dm_get_eventlist=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_xdsm_dm_get_eventlist=no
-+ ac_cv_lib_xdsm_dm_get_eventlist=no
+- ac_cv_lib_dmapi_dm_get_eventlist=no
++ ac_cv_lib_dmapi_dm_get_eventlist=no
fi
-
-rm -rf conftest.dSYM
@@ -64336,26 +65943,26 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
- $as_echo "$ac_cv_lib_xdsm_dm_get_eventlist" >&6; }
--if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then
-+if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then :
- samba_dmapi_libs="-lxdsm"
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dmapi_dm_get_eventlist" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmapi_dm_get_eventlist" >&5
+ $as_echo "$ac_cv_lib_dmapi_dm_get_eventlist" >&6; }
+-if test "x$ac_cv_lib_dmapi_dm_get_eventlist" = x""yes; then
++if test "x$ac_cv_lib_dmapi_dm_get_eventlist" = x""yes; then :
+ samba_dmapi_libs="-ldmapi"
fi
fi
if test x"$samba_dmapi_libs" = x"" ; then
-- { $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -ldmapi" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -ldmapi" >&5
- $as_echo_n "checking for dm_get_eventlist in -ldmapi... " >&6; }
--if test "${ac_cv_lib_dmapi_dm_get_eventlist+set}" = set; then
-+if test "${ac_cv_lib_dmapi_dm_get_eventlist+set}" = set; then :
+- { $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -lxdsm" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -lxdsm" >&5
+ $as_echo_n "checking for dm_get_eventlist in -lxdsm... " >&6; }
+-if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then
++if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmapi $LIBS"
+ LIBS="-lxdsm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -64365,7 +65972,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57125,43 +20922,18 @@
+@@ -59280,43 +22050,18 @@
return 0;
}
_ACEOF
@@ -64391,13 +65998,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dmapi_dm_get_eventlist=yes
+ ac_cv_lib_xdsm_dm_get_eventlist=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_dmapi_dm_get_eventlist=no
-+ ac_cv_lib_dmapi_dm_get_eventlist=no
+- ac_cv_lib_xdsm_dm_get_eventlist=no
++ ac_cv_lib_xdsm_dm_get_eventlist=no
fi
-
-rm -rf conftest.dSYM
@@ -64407,15 +66014,15 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dmapi_dm_get_eventlist" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmapi_dm_get_eventlist" >&5
- $as_echo "$ac_cv_lib_dmapi_dm_get_eventlist" >&6; }
--if test "x$ac_cv_lib_dmapi_dm_get_eventlist" = x""yes; then
-+if test "x$ac_cv_lib_dmapi_dm_get_eventlist" = x""yes; then :
- samba_dmapi_libs="-ldmapi"
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
+ $as_echo "$ac_cv_lib_xdsm_dm_get_eventlist" >&6; }
+-if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then
++if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then :
+ samba_dmapi_libs="-lxdsm"
fi
-@@ -57170,153 +20942,12 @@
+@@ -59325,153 +22070,12 @@
# Only bother to test ehaders if we have a candidate DMAPI library
if test x"$samba_dmapi_libs" != x"" ; then
@@ -64575,7 +66182,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -57330,11 +20961,7 @@
+@@ -59485,11 +22089,7 @@
if test x"$samba_dmapi_libs" != x"" ; then
samba_dmapi_save_LIBS="$LIBS"
LIBS="$LIBS $samba_dmapi_libs"
@@ -64588,10 +66195,14 @@
/* end confdefs.h. */
#include <time.h> /* needed by Tru64 */
-@@ -57369,50 +20996,25 @@
- return 0;
- }
- _ACEOF
+@@ -59520,470 +22120,158 @@
+ /* IRIX 6.4 expects events to be a pointer. */
+ DMEV_ISSET(DM_EVENT_READ, events);
+
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -64613,79 +66224,83 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-
- true # DMAPI link test succeeded
-
- else
+-
+- true # DMAPI link test succeeded
+-
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- # DMAPI link failure
- samba_dmapi_libs=
-
- fi
-
+- # DMAPI link failure
+- samba_dmapi_libs=
+-
+-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="$samba_dmapi_save_LIBS"
- fi
-
- if test x"$samba_dmapi_libs" = x"" ; then
- # DMAPI detection failure actions begin
-
+- LIBS="$samba_dmapi_save_LIBS"
+- fi
+-
+- if test x"$samba_dmapi_libs" = x"" ; then
+- # DMAPI detection failure actions begin
+-
- { $as_echo "$as_me:$LINENO: DMAPI support not present" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: DMAPI support not present" >&5
- $as_echo "$as_me: DMAPI support not present" >&6;}
-
- # DMAPI detection failure actions end
-@@ -57420,11 +21022,9 @@
- # DMAPI detection success actions start
-
-
+-$as_echo "$as_me: DMAPI support not present" >&6;}
+-
+- # DMAPI detection failure actions end
+- else
+- # DMAPI detection success actions start
+-
+-
-cat >>confdefs.h <<\_ACEOF
-#define USE_DMAPI 1
-_ACEOF
-+$as_echo "#define USE_DMAPI 1" >>confdefs.h
-
+-
- { $as_echo "$as_me:$LINENO: Found DMAPI support in $samba_dmapi_libs" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found DMAPI support in $samba_dmapi_libs" >&5
- $as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
-
- # DMAPI detection success actions end
-@@ -57438,20 +21038,16 @@
- default_shared_modules="$default_shared_modules vfs_tsmsm"
- fi
-
+-$as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
+-
+- # DMAPI detection success actions end
+- fi
+-
+-
+-
+-# Add TSM SM VFS module only if there are both GPFS and DMAPI support
+-# Theoretically it should work with AIX JFS2 too but this needs testing
+-if test x"$samba_cv_HAVE_GPFS" = x"yes" && test x"$samba_dmapi_libs" != x"" ; then
+- default_shared_modules="$default_shared_modules vfs_tsmsm"
+-fi
+-
-{ $as_echo "$as_me:$LINENO: checking for kernel share modes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel share modes" >&5
- $as_echo_n "checking for kernel share modes... " >&6; }
+-$as_echo_n "checking for kernel share modes... " >&6; }
-if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then
-+if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-
+- $as_echo_n "(cached) " >&6
+-else
+-
-if test "$cross_compiling" = yes; then
-+if test "$cross_compiling" = yes; then :
- samba_cv_HAVE_KERNEL_SHARE_MODES=cross
- else
+- samba_cv_HAVE_KERNEL_SHARE_MODES=cross
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- #include <sys/types.h>
-@@ -57467,65 +21063,32 @@
- }
-
- _ACEOF
+-/* end confdefs.h. */
+-
+-#include <sys/types.h>
+-#include <fcntl.h>
+-#include <signal.h>
+-#include <sys/file.h>
+-#ifndef LOCK_MAND
+-#define LOCK_MAND 32
+-#define LOCK_READ 64
+-#endif
+-main() {
+- exit(flock(open("/dev/null", O_RDWR), LOCK_MAND|LOCK_READ) != 0);
+-}
+-
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -64708,59 +66323,54 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- samba_cv_HAVE_KERNEL_SHARE_MODES=yes
- else
+- samba_cv_HAVE_KERNEL_SHARE_MODES=yes
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-samba_cv_HAVE_KERNEL_SHARE_MODES=no
-+ samba_cv_HAVE_KERNEL_SHARE_MODES=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: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
- $as_echo "$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
- if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
-
+-$as_echo "$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
+-if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KERNEL_SHARE_MODES 1
-_ACEOF
-+$as_echo "#define HAVE_KERNEL_SHARE_MODES 1" >>confdefs.h
-
- fi
-
-
+-
+-fi
+-
+-
-{ $as_echo "$as_me:$LINENO: checking for IRIX kernel oplock type definitions" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IRIX kernel oplock type definitions" >&5
- $as_echo_n "checking for IRIX kernel oplock type definitions... " >&6; }
+-$as_echo_n "checking for IRIX kernel oplock type definitions... " >&6; }
-if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then
-+if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-
+- $as_echo_n "(cached) " >&6
+-else
+-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <fcntl.h>
-@@ -57537,185 +21100,29 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <fcntl.h>
+-int
+-main ()
+-{
+-oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -64779,33 +66389,29 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
- else
+- samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
-+ samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
- $as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
- if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
-
+-$as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
+-if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KERNEL_OPLOCKS_IRIX 1
-_ACEOF
-+$as_echo "#define HAVE_KERNEL_OPLOCKS_IRIX 1" >>confdefs.h
-
- fi
-
- #################################################
- # Check for POSIX capability support
-
+-
+-fi
+-
+-#################################################
+-# Check for POSIX capability support
+-
-if test "${ac_cv_header_sys_capability_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for sys/capability.h" >&5
-$as_echo_n "checking for sys/capability.h... " >&6; }
@@ -64931,38 +66537,75 @@
-$as_echo_n "checking for sys/capability.h... " >&6; }
-if test "${ac_cv_header_sys_capability_h+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++ true # DMAPI link test succeeded
++
+ else
- ac_cv_header_sys_capability_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_capability_h" >&5
-$as_echo "$ac_cv_header_sys_capability_h" >&6; }
--
--fi
++
++ # DMAPI link failure
++ samba_dmapi_libs=
+
+ fi
-if test "x$ac_cv_header_sys_capability_h" = 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 :
- samba_cv_HAVE_SYS_CAPABILITY_H=yes;
+- samba_cv_HAVE_SYS_CAPABILITY_H=yes;
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$samba_dmapi_save_LIBS"
++ fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_CAPABILITY_H 1
-_ACEOF
-+$as_echo "#define HAVE_SYS_CAPABILITY_H 1" >>confdefs.h
++ if test x"$samba_dmapi_libs" = x"" ; then
++ # DMAPI detection failure actions begin
- fi
+-fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: DMAPI support not present" >&5
++$as_echo "$as_me: DMAPI support not present" >&6;}
-@@ -57725,110 +21132,18 @@
++ # DMAPI detection failure actions end
++ else
++ # DMAPI detection success actions start
- ac_save_LIBS=$LIBS
--
+-if test x"$samba_cv_HAVE_SYS_CAPABILITY_H" = x"yes"; then
++$as_echo "#define USE_DMAPI 1" >>confdefs.h
+
+- ac_save_LIBS=$LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: Found DMAPI support in $samba_dmapi_libs" >&5
++$as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
++
++ # DMAPI detection success actions end
++ fi
+
+
-for ac_func in cap_get_proc
-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
++
++# Add TSM SM VFS module only if there are both GPFS and DMAPI support
++# Theoretically it should work with AIX JFS2 too but this needs testing
++if test x"$samba_cv_HAVE_GPFS" = x"yes" && test x"$samba_dmapi_libs" != x"" ; then
++ default_shared_modules="$default_shared_modules vfs_tsmsm"
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel share modes" >&5
++$as_echo_n "checking for kernel share modes... " >&6; }
++if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -64972,20 +66615,49 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_KERNEL_SHARE_MODES=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
--#endif
--
++#include <sys/types.h>
++#include <fcntl.h>
++#include <signal.h>
++#include <sys/file.h>
++#ifndef LOCK_MAND
++#define LOCK_MAND 32
++#define LOCK_READ 64
+ #endif
++main() {
++ exit(flock(open("/dev/null", O_RDWR), LOCK_MAND|LOCK_READ) != 0);
++}
++
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_KERNEL_SHARE_MODES=yes
++else
++ samba_cv_HAVE_KERNEL_SHARE_MODES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
-#undef $ac_func
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_SHARE_MODES" >&5
++$as_echo "$samba_cv_HAVE_KERNEL_SHARE_MODES" >&6; }
++if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = 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. */
@@ -64999,15 +66671,30 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
--int
--main ()
--{
++$as_echo "#define HAVE_KERNEL_SHARE_MODES 1" >>confdefs.h
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IRIX kernel oplock type definitions" >&5
++$as_echo_n "checking for IRIX kernel oplock type definitions... " >&6; }
++if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <fcntl.h>
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -65030,17 +66717,37 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&5
++$as_echo "$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" >&6; }
++if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
++
++$as_echo "#define HAVE_KERNEL_OPLOCKS_IRIX 1" >>confdefs.h
+
- 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
--fi
++#################################################
++# Check for POSIX capability support
++
++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 :
++ samba_cv_HAVE_SYS_CAPABILITY_H=yes;
++
++$as_echo "#define HAVE_SYS_CAPABILITY_H 1" >>confdefs.h
++
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -65048,6 +66755,13 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++
++
++if test x"$samba_cv_HAVE_SYS_CAPABILITY_H" = x"yes"; then
++
++ ac_save_LIBS=$LIBS
++
+ for ac_func in cap_get_proc
+do :
+ ac_fn_c_check_func "$LINENO" "cap_get_proc" "ac_cv_func_cap_get_proc"
@@ -65067,7 +66781,7 @@
-@@ -57845,18 +21160,14 @@
+@@ -60000,18 +22288,14 @@
;;
*)
# cap_get_proc was not found, try adding libcap
@@ -65089,7 +66803,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57874,50 +21185,23 @@
+@@ -60029,50 +22313,23 @@
return 0;
}
_ACEOF
@@ -65147,7 +66861,7 @@
-@@ -57939,20 +21223,16 @@
+@@ -60094,20 +22351,16 @@
@@ -65172,7 +66886,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -57968,52 +21248,23 @@
+@@ -60123,52 +22376,23 @@
exit(0);
}
_ACEOF
@@ -65231,7 +66945,7 @@
else
LIBS=$ac_save_LIBS
-@@ -58026,17 +21277,13 @@
+@@ -60181,17 +22405,13 @@
# This is *really* broken but some systems (DEC OSF1) do this.... JRA.
#
@@ -65252,7 +66966,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58050,55 +21297,28 @@
+@@ -60205,55 +22425,28 @@
return 0;
}
_ACEOF
@@ -65315,7 +67029,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58112,55 +21332,28 @@
+@@ -60267,55 +22460,28 @@
return 0;
}
_ACEOF
@@ -65378,7 +67092,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58174,55 +21367,28 @@
+@@ -60329,55 +22495,28 @@
return 0;
}
_ACEOF
@@ -65441,7 +67155,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58236,56 +21402,29 @@
+@@ -60391,56 +22530,29 @@
return 0;
}
_ACEOF
@@ -65505,7 +67219,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_SECURITY_H
-@@ -58303,238 +21442,112 @@
+@@ -60458,238 +22570,112 @@
return 0;
}
_ACEOF
@@ -65780,7 +67494,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58545,63 +21558,32 @@
+@@ -60700,63 +22686,32 @@
return 0;
}
_ACEOF
@@ -65853,7 +67567,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58612,281 +21594,102 @@
+@@ -60767,63 +22722,32 @@
return 0;
}
_ACEOF
@@ -65904,31 +67618,32 @@
-cat >>confdefs.h <<\_ACEOF
-#define SYSCONF_SC_NPROC_ONLN 1
-_ACEOF
--
-- fi
--
--
++$as_echo "#define SYSCONF_SC_NPROC_ONLN 1" >>confdefs.h
+
+ fi
+
+
- { $as_echo "$as_me:$LINENO: checking for sysconf(_SC_NPROCESSORS_ONLN)" >&5
--$as_echo_n "checking for sysconf(_SC_NPROCESSORS_ONLN)... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_NPROCESSORS_ONLN)" >&5
+ $as_echo_n "checking for sysconf(_SC_NPROCESSORS_ONLN)... " >&6; }
-if test "${samba_cv_SYSCONF_SC_NPROCESSORS_ONLN+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
--
++if test "${samba_cv_SYSCONF_SC_NPROCESSORS_ONLN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <unistd.h>
--int
--main ()
--{
-- return sysconf(_SC_NPROCESSORS_ONLN) == -1 ? 1 : 0;
-- ;
-- return 0;
--}
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <unistd.h>
+ int
+@@ -60834,63 +22758,32 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -65950,38 +67665,42 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ 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
--fi
++ samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&5
--$as_echo "$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&6; }
--
-- if test x"$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" = x"yes" ; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&5
+ $as_echo "$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&6; }
+
+ if test x"$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" = x"yes" ; then
+
-cat >>confdefs.h <<\_ACEOF
-#define SYSCONF_SC_NPROCESSORS_ONLN 1
-_ACEOF
-+$as_echo "#define SYSCONF_SC_NPROC_ONLN 1" >>confdefs.h
++$as_echo "#define SYSCONF_SC_NPROCESSORS_ONLN 1" >>confdefs.h
fi
- { $as_echo "$as_me:$LINENO: checking for sysconf(_SC_PAGESIZE)" >&5
--$as_echo_n "checking for sysconf(_SC_PAGESIZE)... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_PAGESIZE)" >&5
+ $as_echo_n "checking for sysconf(_SC_PAGESIZE)... " >&6; }
-if test "${samba_cv_SYSCONF_SC_PAGESIZE+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_NPROCESSORS_ONLN)" >&5
-+$as_echo_n "checking for sysconf(_SC_NPROCESSORS_ONLN)... " >&6; }
-+if test "${samba_cv_SYSCONF_SC_NPROCESSORS_ONLN+set}" = set; then :
++if test "${samba_cv_SYSCONF_SC_PAGESIZE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -65994,11 +67713,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
- main ()
- {
-- return sysconf(_SC_PAGESIZE) == -1 ? 1 : 0;
-+ return sysconf(_SC_NPROCESSORS_ONLN) == -1 ? 1 : 0;
- ;
+@@ -60901,147 +22794,30 @@
return 0;
}
_ACEOF
@@ -66023,15 +67738,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- samba_cv_SYSCONF_SC_PAGESIZE=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=yes
+ samba_cv_SYSCONF_SC_PAGESIZE=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_SYSCONF_SC_PAGESIZE=no
-+ samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
++ samba_cv_SYSCONF_SC_PAGESIZE=no
fi
-
-rm -rf conftest.dSYM
@@ -66042,32 +67756,27 @@
fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_SYSCONF_SC_PAGESIZE" >&5
--$as_echo "$samba_cv_SYSCONF_SC_PAGESIZE" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&5
-+$as_echo "$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_SYSCONF_SC_PAGESIZE" >&5
+ $as_echo "$samba_cv_SYSCONF_SC_PAGESIZE" >&6; }
-- if test x"$samba_cv_SYSCONF_SC_PAGESIZE" = x"yes" ; then
-+ if test x"$samba_cv_SYSCONF_SC_NPROCESSORS_ONLN" = x"yes" ; then
+ if test x"$samba_cv_SYSCONF_SC_PAGESIZE" = x"yes" ; then
-cat >>confdefs.h <<\_ACEOF
-#define SYSCONF_SC_PAGESIZE 1
-_ACEOF
-+$as_echo "#define SYSCONF_SC_NPROCESSORS_ONLN 1" >>confdefs.h
++$as_echo "#define SYSCONF_SC_PAGESIZE 1" >>confdefs.h
fi
-
--for ac_func in getpagesize
+-
+ for ac_func in getpagesize
-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 sysconf(_SC_PAGESIZE)" >&5
-+$as_echo_n "checking for sysconf(_SC_PAGESIZE)... " >&6; }
-+if test "${samba_cv_SYSCONF_SC_PAGESIZE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -66104,19 +67813,15 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <unistd.h>
- int
- main ()
- {
+-
+-int
+-main ()
+-{
-return $ac_func ();
-+ return sysconf(_SC_PAGESIZE) == -1 ? 1 : 0;
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -66139,22 +67844,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ samba_cv_SYSCONF_SC_PAGESIZE=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ samba_cv_SYSCONF_SC_PAGESIZE=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
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -66162,16 +67862,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_SYSCONF_SC_PAGESIZE" >&5
-+$as_echo "$samba_cv_SYSCONF_SC_PAGESIZE" >&6; }
-+
-+ if test x"$samba_cv_SYSCONF_SC_PAGESIZE" = x"yes" ; then
-+
-+$as_echo "#define SYSCONF_SC_PAGESIZE 1" >>confdefs.h
-+
-+ fi
-+
-+for ac_func in getpagesize
+do :
+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
@@ -66181,7 +67871,7 @@
_ACEOF
fi
-@@ -58898,20 +21701,16 @@
+@@ -61053,20 +22829,16 @@
seteuid=no;
if test $seteuid = no; then
@@ -66206,7 +67896,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -58919,50 +21718,21 @@
+@@ -61074,50 +22846,21 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66263,7 +67953,7 @@
fi
fi
-@@ -58970,20 +21740,16 @@
+@@ -61125,20 +22868,16 @@
# we check for setresuid second as it conflicts with AIO on Linux.
# see http://samba.org/~tridge/junkcode/aio_uid.c
if test $seteuid = no; then
@@ -66288,7 +67978,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -58991,69 +21757,36 @@
+@@ -61146,69 +22885,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66368,7 +68058,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59061,69 +21794,36 @@
+@@ -61216,69 +22922,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66448,7 +68138,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59131,64 +21831,31 @@
+@@ -61286,64 +22959,31 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66522,7 +68212,7 @@
/* end confdefs.h. */
#include <sys/syscall.h>
-@@ -59202,195 +21869,98 @@
+@@ -61357,195 +22997,98 @@
return 0;
}
_ACEOF
@@ -66586,18 +68276,16 @@
else
-if test "$cross_compiling" = yes; then
-+if test "$cross_compiling" = yes; then :
- samba_cv_HAVE_FCNTL_LOCK=cross
- else
+- samba_cv_HAVE_FCNTL_LOCK=cross
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include "${srcdir-.}/../tests/fcntl_lock.c"
- _ACEOF
+-/* end confdefs.h. */
+-#include "${srcdir-.}/../tests/fcntl_lock.c"
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -66620,6 +68308,13 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
++if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_FCNTL_LOCK=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include "${srcdir-.}/../tests/fcntl_lock.c"
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
samba_cv_HAVE_FCNTL_LOCK=yes
else
@@ -66748,7 +68443,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -59414,66 +21984,33 @@
+@@ -61569,67 +23112,34 @@
#endif
}
_ACEOF
@@ -66807,6 +68502,71 @@
fi
fi
+ # glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
+-{ $as_echo "$as_me:$LINENO: checking for broken posix_fallocate" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken posix_fallocate" >&5
+ $as_echo_n "checking for broken posix_fallocate... " >&6; }
+-if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then
++if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 600
+@@ -61647,56 +23157,29 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
++ samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
+ $as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
+ if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BROKEN_POSIX_FALLOCATE /**/
+-_ACEOF
++$as_echo "#define HAVE_BROKEN_POSIX_FALLOCATE /**/" >>confdefs.h
+
+ fi
+
+
-{ $as_echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
$as_echo_n "checking for st_blocks in struct stat... " >&6; }
@@ -66824,7 +68584,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59486,55 +22023,28 @@
+@@ -61709,141 +23192,24 @@
return 0;
}
_ACEOF
@@ -66866,10 +68626,224 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT_ST_BLOCKS 1
-_ACEOF
+-
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for blksize_t" >&5
+-$as_echo_n "checking for blksize_t... " >&6; }
+-if test "${ac_cv_type_blksize_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_type_blksize_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof (blksize_t))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof ((blksize_t)))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_blksize_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+$as_echo "#define HAVE_STAT_ST_BLOCKS 1" >>confdefs.h
fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blksize_t" >&5
+-$as_echo "$ac_cv_type_blksize_t" >&6; }
+-if test "x$ac_cv_type_blksize_t" = x""yes; then
++ac_fn_c_check_type "$LINENO" "blksize_t" "ac_cv_type_blksize_t" "#include <sys/stat.h>
++"
++if test "x$ac_cv_type_blksize_t" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_BLKSIZE_T 1
+@@ -61851,103 +23217,9 @@
+
+
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for blkcnt_t" >&5
+-$as_echo_n "checking for blkcnt_t... " >&6; }
+-if test "${ac_cv_type_blkcnt_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_type_blkcnt_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof (blkcnt_t))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof ((blkcnt_t)))
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_blkcnt_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blkcnt_t" >&5
+-$as_echo "$ac_cv_type_blkcnt_t" >&6; }
+-if test "x$ac_cv_type_blkcnt_t" = x""yes; then
++ac_fn_c_check_type "$LINENO" "blkcnt_t" "ac_cv_type_blkcnt_t" "#include <sys/stat.h>
++"
++if test "x$ac_cv_type_blkcnt_t" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_BLKCNT_T 1
+@@ -61957,17 +23229,13 @@
+ fi
+
+
-{ $as_echo "$as_me:$LINENO: checking for st_blksize in struct stat" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blksize in struct stat" >&5
$as_echo_n "checking for st_blksize in struct stat... " >&6; }
@@ -66887,7 +68861,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59547,55 +22057,28 @@
+@@ -61980,55 +23248,28 @@
return 0;
}
_ACEOF
@@ -66950,7 +68924,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59608,57 +22091,30 @@
+@@ -62041,57 +23282,30 @@
return 0;
}
_ACEOF
@@ -67015,7 +68989,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -59674,58 +22130,31 @@
+@@ -62107,58 +23321,31 @@
return 0;
}
_ACEOF
@@ -67082,7 +69056,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -59744,74 +22173,45 @@
+@@ -62177,74 +23364,45 @@
}
_ACEOF
@@ -67168,7 +69142,7 @@
$as_echo "no" >&6; }
fi
-@@ -59820,24 +22220,24 @@
+@@ -62253,24 +23411,24 @@
####################################################
# check for Linux-specific AFS fake-kaserver support
samba_cv_WITH_FAKE_KASERVER=no
@@ -67198,7 +69172,7 @@
$as_echo "no" >&6; }
fi
-@@ -59849,18 +22249,14 @@
+@@ -62282,18 +23440,14 @@
test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
# see if this box has the OpenSSL DES libraries
@@ -67220,7 +69194,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -59878,208 +22274,43 @@
+@@ -62311,208 +23465,43 @@
return 0;
}
_ACEOF
@@ -67445,7 +69419,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -60091,12 +22322,10 @@
+@@ -62524,12 +23513,10 @@
if test x"$ac_cv_header_afs_h" = x"no" && test x"$ac_cv_header_afs_afs_h" = x"no"; then
if test x"$samba_cv_WITH_FAKE_KASERVER" = x"auto" ||
test x"$samba_cv_WITH_AFS" = x"auto"; then
@@ -67460,7 +69434,7 @@
fi
else
have_afs_headers=yes
-@@ -60106,9 +22335,7 @@
+@@ -62539,9 +23526,7 @@
FAKE_KASERVER_OBJ=""
if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
@@ -67471,7 +69445,7 @@
FAKE_KASERVER_OBJ="utils/net_afs.o"
fi
-@@ -60117,24 +22344,24 @@
+@@ -62550,24 +23535,24 @@
#################################################
# check whether to compile AFS/NT ACL mapping module
samba_cv_WITH_VFS_AFSACL=no
@@ -67501,7 +69475,7 @@
$as_echo "no" >&6; }
fi
-@@ -60146,36 +22373,32 @@
+@@ -62579,36 +23564,32 @@
if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
@@ -67545,7 +69519,7 @@
$as_echo "no" >&6; }
fi
-@@ -60185,12 +22408,12 @@
+@@ -62618,12 +23599,12 @@
# Compile with LDAP support?
with_ldap_support=auto
@@ -67560,7 +69534,7 @@
withval=$with_ldap; case "$withval" in
yes|no)
with_ldap_support=$withval
-@@ -60199,303 +22422,70 @@
+@@ -62632,7 +23613,7 @@
fi
@@ -67569,19 +69543,12 @@
$as_echo "$with_ldap_support" >&6; }
SMBLDAP=""
-
- SMBLDAPUTIL=""
-
--LDBLDAP=""
+@@ -62647,150 +23628,12 @@
+ ##################################################################
+ # first test for ldap.h and lber.h
+ # (ldap.h is required for this test)
-
-
--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`
@@ -67724,40 +69691,42 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
-- if test x"$ac_cv_header_ldap_h" != x"yes"; then
-- if test x"$with_ldap_support" = x"yes"; then
++ 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
+@@ -62802,11 +23645,9 @@
+
+ if test x"$ac_cv_header_ldap_h" != x"yes"; then
+ if test x"$with_ldap_support" = x"yes"; then
- { { $as_echo "$as_me:$LINENO: error: ldap.h is needed for LDAP support" >&5
-$as_echo "$as_me: error: ldap.h is needed for LDAP support" >&2;}
- { (exit 1); exit 1; }; }
-- else
++ as_fn_error "ldap.h is needed for LDAP support" "$LINENO" 5
+ else
- { $as_echo "$as_me:$LINENO: WARNING: ldap.h is needed for LDAP support" >&5
--$as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
-- fi
--
-- with_ldap_support=no
-- fi
--
-- ##################################################################
-- # HP/UX does not have ber_tag_t in lber.h - it must be configured as
-- # unsigned int in include/includes.h
-- case $host_os in
-- *hpux*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ldap.h is needed for LDAP support" >&5
+ $as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
+ fi
+
+@@ -62818,117 +23659,24 @@
+ # unsigned int in include/includes.h
+ case $host_os in
+ *hpux*)
- { $as_echo "$as_me:$LINENO: WARNING: ber_tag_t is needed for LDAP support" >&5
--$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ber_tag_t is needed for LDAP support" >&5
+ $as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: ber_tag_t must be configured in includes.h for hpux" >&5
--$as_echo "$as_me: WARNING: ber_tag_t must be configured in includes.h for hpux" >&2;}
-- with_ldap_support=yes
-- ;;
-- *)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ber_tag_t must be configured in includes.h for hpux" >&5
+ $as_echo "$as_me: WARNING: ber_tag_t must be configured in includes.h for hpux" >&2;}
+ with_ldap_support=yes
+ ;;
+ *)
- { $as_echo "$as_me:$LINENO: checking for ber_tag_t" >&5
-$as_echo_n "checking for ber_tag_t... " >&6; }
-if test "${ac_cv_type_ber_tag_t+set}" = set; then
@@ -67815,23 +69784,7 @@
- ;
- return 0;
-}
-+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)
-+ 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
@@ -67854,41 +69807,17 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_ber_tag_t=yes
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+done
-
-
+-
+-
-fi
-+ if test x"$ac_cv_header_ldap_h" != x"yes"; then
-+ if test x"$with_ldap_support" = x"yes"; then
-+ as_fn_error "ldap.h is needed for LDAP support" "$LINENO" 5
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ldap.h is needed for LDAP support" >&5
-+$as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
-+ fi
-+
-+ with_ldap_support=no
-+ fi
-+
-+ ##################################################################
-+ # HP/UX does not have ber_tag_t in lber.h - it must be configured as
-+ # unsigned int in include/includes.h
-+ case $host_os in
-+ *hpux*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ber_tag_t is needed for LDAP support" >&5
-+$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ber_tag_t must be configured in includes.h for hpux" >&5
-+$as_echo "$as_me: WARNING: ber_tag_t must be configured in includes.h for hpux" >&2;}
-+ with_ldap_support=yes
-+ ;;
-+ *)
+ ac_fn_c_check_type "$LINENO" "ber_tag_t" "ac_cv_type_ber_tag_t" "#include <lber.h>
+"
+if test "x$ac_cv_type_ber_tag_t" = x""yes; then :
@@ -67910,7 +69839,7 @@
$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
fi
with_ldap_support=no
-@@ -60512,23 +22502,17 @@
+@@ -62945,23 +23693,17 @@
# this test must be before the libldap test
@@ -67937,7 +69866,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -60546,54 +22530,28 @@
+@@ -62979,54 +23721,28 @@
return 0;
}
_ACEOF
@@ -67999,7 +69928,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLBER 1
_ACEOF
-@@ -60609,25 +22567,19 @@
+@@ -63042,25 +23758,19 @@
fi
@@ -68028,7 +69957,7 @@
/* end confdefs.h. */
/* Define ber_sockbuf_add_io to an innocuous variant, in case <limits.h> declares ber_sockbuf_add_io.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -60668,61 +22620,31 @@
+@@ -63101,61 +23811,31 @@
return 0;
}
_ACEOF
@@ -68099,7 +70028,7 @@
/* end confdefs.h. */
#include <ldap.h>
int
-@@ -60733,59 +22655,32 @@
+@@ -63166,105 +23846,55 @@
return 0;
}
_ACEOF
@@ -68166,10 +70095,13 @@
/* end confdefs.h. */
#include <lber.h>
int
-@@ -60796,42 +22691,19 @@
- return 0;
- }
- _ACEOF
+ main ()
+ {
+ int val = LBER_OPT_LOG_PRINT_FN;
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -68188,6 +70120,10 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN=yes
else
@@ -68213,7 +70149,7 @@
fi
-@@ -60839,23 +22711,17 @@
+@@ -63272,23 +23902,17 @@
# now see if we can find the ldap libs in standard paths
@@ -68240,7 +70176,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -60873,54 +22739,28 @@
+@@ -63306,54 +23930,28 @@
return 0;
}
_ACEOF
@@ -68302,7 +70238,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLDAP 1
_ACEOF
-@@ -60936,25 +22776,19 @@
+@@ -63369,25 +23967,19 @@
fi
@@ -68331,7 +70267,7 @@
/* end confdefs.h. */
/* Define ldap_set_rebind_proc to an innocuous variant, in case <limits.h> declares ldap_set_rebind_proc.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -60995,62 +22829,32 @@
+@@ -63428,62 +24020,32 @@
return 0;
}
_ACEOF
@@ -68403,7 +70339,7 @@
/* end confdefs.h. */
#include <lber.h>
-@@ -61063,37 +22867,16 @@
+@@ -63496,37 +24058,16 @@
return 0;
}
_ACEOF
@@ -68444,7 +70380,7 @@
$as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
-@@ -61104,19 +22887,14 @@
+@@ -63537,19 +24078,14 @@
@@ -68467,7 +70403,7 @@
/* end confdefs.h. */
/* Define ldap_initialize to an innocuous variant, in case <limits.h> declares ldap_initialize.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -61157,55 +22935,27 @@
+@@ -63590,55 +24126,27 @@
return 0;
}
_ACEOF
@@ -68530,7 +70466,7 @@
CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -61213,17 +22963,15 @@
+@@ -63646,17 +24154,15 @@
SMBLDAP="lib/smbldap.o"
SMBLDAPUTIL="lib/smbldap_util.o"
with_ldap_support=yes
@@ -68552,7 +70488,7 @@
$as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
fi
-@@ -61238,12 +22986,12 @@
+@@ -63671,12 +24177,12 @@
# active directory support
with_ads_support=auto
@@ -68567,7 +70503,7 @@
withval=$with_ads; case "$withval" in
yes|no)
with_ads_support="$withval"
-@@ -61252,7 +23000,7 @@
+@@ -63685,7 +24191,7 @@
fi
@@ -68576,7 +70512,7 @@
$as_echo "$with_ads_support" >&6; }
FOUND_KRB5=no
-@@ -61261,11 +23009,9 @@
+@@ -63694,11 +24200,9 @@
if test x"$with_ldap_support" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -68590,7 +70526,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
with_ads_support=no
fi
-@@ -61280,19 +23026,14 @@
+@@ -63713,19 +24217,14 @@
*hpux*)
@@ -68613,7 +70549,7 @@
/* end confdefs.h. */
/* Define ldap_init to an innocuous variant, in case <limits.h> declares ldap_init.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -61333,57 +23074,29 @@
+@@ -63766,57 +24265,29 @@
return 0;
}
_ACEOF
@@ -68679,7 +70615,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
with_ads_support=no
fi
-@@ -61392,19 +23105,14 @@
+@@ -63825,19 +24296,14 @@
*)
@@ -68702,7 +70638,7 @@
/* end confdefs.h. */
/* Define ldap_initialize to an innocuous variant, in case <limits.h> declares ldap_initialize.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -61445,57 +23153,29 @@
+@@ -63878,57 +24344,29 @@
return 0;
}
_ACEOF
@@ -68768,7 +70704,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
with_ads_support=no
fi
-@@ -61506,19 +23186,14 @@
+@@ -63939,19 +24377,14 @@
@@ -68791,7 +70727,7 @@
/* end confdefs.h. */
/* Define ldap_add_result_entry to an innocuous variant, in case <limits.h> declares ldap_add_result_entry.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -61559,57 +23234,29 @@
+@@ -63992,57 +24425,29 @@
return 0;
}
_ACEOF
@@ -68857,7 +70793,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
with_ads_support=no
fi
-@@ -61625,23 +23272,23 @@
+@@ -64058,23 +24463,23 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# check for location of Kerberos 5 install
@@ -68886,7 +70822,7 @@
$as_echo "$withval" >&6; }
KRB5_CFLAGS="-I$withval/include"
KRB5_CPPFLAGS="-I$withval/include"
-@@ -61653,7 +23300,7 @@
+@@ -64086,7 +24491,7 @@
;;
esac
else
@@ -68895,7 +70831,7 @@
$as_echo "no krb5-path given" >&6; }
fi
-@@ -61664,9 +23311,9 @@
+@@ -64097,9 +24502,9 @@
# check for krb5-config from recent MIT and Heimdal kerberos 5
# Extract the first word of "krb5-config", so it can be a program name with args.
set dummy krb5-config; ac_word=$2
@@ -68907,7 +70843,7 @@
$as_echo_n "(cached) " >&6
else
case $KRB5CONFIG in
-@@ -61679,14 +23326,14 @@
+@@ -64112,14 +24517,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -68925,7 +70861,7 @@
IFS=$as_save_IFS
;;
-@@ -61694,15 +23341,15 @@
+@@ -64127,15 +24532,15 @@
fi
KRB5CONFIG=$ac_cv_path_KRB5CONFIG
if test -n "$KRB5CONFIG"; then
@@ -68944,7 +70880,7 @@
$as_echo_n "checking for working krb5-config... " >&6; }
if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then
ac_save_CFLAGS=$CFLAGS
-@@ -61716,17 +23363,17 @@
+@@ -64149,17 +24554,17 @@
CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes
@@ -68965,7 +70901,7 @@
$as_echo_n "checking for /usr/include/heimdal... " >&6; }
if test -d /usr/include/heimdal; then
if test -f /usr/lib/heimdal/lib/libkrb5.a; then
-@@ -61734,17 +23381,17 @@
+@@ -64167,17 +24572,17 @@
KRB5_CPPFLAGS="-I/usr/include/heimdal"
KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
FOUND_KRB5=yes
@@ -68986,7 +70922,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61752,17 +23399,17 @@
+@@ -64185,17 +24590,17 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the RedHat location for kerberos
@@ -69007,7 +70943,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61770,16 +23417,16 @@
+@@ -64203,16 +24608,16 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the OpenBSD location for heimdal krb5
@@ -69027,7 +70963,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61866,151 +23513,12 @@
+@@ -64299,151 +24704,12 @@
# now check for krb5.h. Some systems have the libraries without the headers!
# note that this check is done here to allow for different kerberos
# include paths
@@ -69184,7 +71120,7 @@
_ACEOF
fi
-@@ -62024,11 +23532,9 @@
+@@ -64457,11 +24723,9 @@
# i.e with_ads_support = auto, otherwise die with an error.
if test x"$with_ads_support" = x"yes"; then
@@ -69198,7 +71134,7 @@
$as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
fi
-@@ -62040,151 +23546,12 @@
+@@ -64473,65 +24737,16 @@
CPPFLAGS=$ac_save_CPPFLAGS
LDFLAGS=$ac_save_LDFLAGS
fi
@@ -69206,27 +71142,25 @@
-for ac_header in krb5/locate_plugin.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--$ac_includes_default
+-#ifdef HAVE_KRB5_H
++ for ac_header in krb5/locate_plugin.h
++do :
++ ac_fn_c_check_header_compile "$LINENO" "krb5/locate_plugin.h" "ac_cv_header_krb5_locate_plugin_h" "#ifdef HAVE_KRB5_H
+ #include <krb5.h>
+ #endif
+
+-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
@@ -69247,115 +71181,100 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
+- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_compiler=no
+- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++"
++if test "x$ac_cv_header_krb5_locate_plugin_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_KRB5_LOCATE_PLUGIN_H 1
+ _ACEOF
+
+ fi
+@@ -64548,17 +24763,13 @@
+
+ # check for new heimdal KRB5_DEPRECATED handling
+
+- { $as_echo "$as_me:$LINENO: checking for KRB5_DEPRECATED define taking an identifier" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KRB5_DEPRECATED define taking an identifier" >&5
+ $as_echo_n "checking for KRB5_DEPRECATED define taking an identifier... " >&6; }
+-if test "${samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER+set}" = set; then
++if test "${samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #define KRB5_DEPRECATED 1
+ #include <krb5.h>
+@@ -64570,42 +24781,19 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
--else
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_preproc=no
--fi
+- samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no
++ samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no
+ fi
-
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- ( cat <<\_ASBOX
--## ---------------------------------------- ##
--## Report this to samba-technical at samba.org ##
--## ---------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+ for ac_header in krb5/locate_plugin.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "krb5/locate_plugin.h" "ac_cv_header_krb5_locate_plugin_h" "$ac_includes_default"
-+if test "x$ac_cv_header_krb5_locate_plugin_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_KRB5_LOCATE_PLUGIN_H 1
- _ACEOF
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER" >&5
+ $as_echo "$samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER" >&6; }
+ if test x"$samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER" = x"yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER 1
+-_ACEOF
++$as_echo "#define HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER 1" >>confdefs.h
+
+ fi
fi
-@@ -62206,152 +23573,12 @@
+@@ -64619,152 +24807,12 @@
# now check for gssapi headers. This is also done here to allow for
# different kerberos include paths
@@ -69514,7 +71433,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -62365,23 +23592,17 @@
+@@ -64778,23 +24826,17 @@
# we might need the k5crypto and com_err libraries on some systems
@@ -69541,7 +71460,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62399,54 +23620,28 @@
+@@ -64812,54 +24854,28 @@
return 0;
}
_ACEOF
@@ -69603,7 +71522,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCOM_ERR 1
_ACEOF
-@@ -62463,24 +23658,17 @@
+@@ -64876,24 +24892,17 @@
fi
@@ -69631,7 +71550,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62498,54 +23686,28 @@
+@@ -64911,54 +24920,28 @@
return 0;
}
_ACEOF
@@ -69693,7 +71612,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBK5CRYPTO 1
_ACEOF
-@@ -62561,27 +23723,20 @@
+@@ -64974,27 +24957,20 @@
fi
@@ -69724,7 +71643,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62599,54 +23754,28 @@
+@@ -65012,54 +24988,28 @@
return 0;
}
_ACEOF
@@ -69786,7 +71705,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
-@@ -62663,24 +23792,17 @@
+@@ -65076,24 +25026,17 @@
fi
@@ -69814,16 +71733,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62692,60 +23814,34 @@
- char copy_Authenticator ();
- int
- main ()
--{
--return copy_Authenticator ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -65111,54 +25054,28 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -69845,12 +71758,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+{
-+return copy_Authenticator ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ext_asn1_copy_Authenticator=yes;
ac_cv_lib_ext_asn1=yes
@@ -69888,7 +71795,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBASN1 1
_ACEOF
-@@ -62762,24 +23858,17 @@
+@@ -65175,24 +25092,17 @@
fi
@@ -69916,7 +71823,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62797,54 +23886,28 @@
+@@ -65210,54 +25120,28 @@
return 0;
}
_ACEOF
@@ -69978,7 +71885,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBROKEN 1
_ACEOF
-@@ -62860,27 +23923,20 @@
+@@ -65273,27 +25157,20 @@
fi
@@ -70009,7 +71916,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62898,54 +23954,28 @@
+@@ -65311,54 +25188,28 @@
return 0;
}
_ACEOF
@@ -70071,7 +71978,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI 1
_ACEOF
-@@ -62961,29 +23991,22 @@
+@@ -65374,29 +25225,22 @@
fi
@@ -70104,7 +72011,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63001,54 +24024,28 @@
+@@ -65414,54 +25258,28 @@
return 0;
}
_ACEOF
@@ -70166,7 +72073,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -63065,24 +24062,17 @@
+@@ -65478,24 +25296,17 @@
fi
@@ -70194,7 +72101,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63100,54 +24090,28 @@
+@@ -65513,54 +25324,28 @@
return 0;
}
_ACEOF
@@ -70256,7 +72163,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -63163,29 +24127,22 @@
+@@ -65576,29 +25361,22 @@
fi
@@ -70289,7 +72196,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63203,54 +24160,28 @@
+@@ -65616,54 +25394,28 @@
return 0;
}
_ACEOF
@@ -70351,7 +72258,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI_KRB5 1
_ACEOF
-@@ -63265,24 +24196,18 @@
+@@ -65678,24 +25430,18 @@
have_gssapi=yes
fi
@@ -70379,7 +72286,7 @@
/* end confdefs.h. */
/* Define krb5_set_real_time to an innocuous variant, in case <limits.h> declares krb5_set_real_time.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -63323,43 +24248,18 @@
+@@ -65736,43 +25482,18 @@
return 0;
}
_ACEOF
@@ -70429,7 +72336,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_REAL_TIME 1
_ACEOF
-@@ -63367,20 +24267,14 @@
+@@ -65780,20 +25501,14 @@
fi
@@ -70453,7 +72360,7 @@
/* end confdefs.h. */
/* Define krb5_set_default_in_tkt_etypes to an innocuous variant, in case <limits.h> declares krb5_set_default_in_tkt_etypes.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -63421,43 +24315,18 @@
+@@ -65834,43 +25549,18 @@
return 0;
}
_ACEOF
@@ -70478,13 +72385,15 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_func_ext_krb5_set_default_in_tkt_etypes=yes
- else
+- ac_cv_func_ext_krb5_set_default_in_tkt_etypes=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_ext_krb5_set_default_in_tkt_etypes=no
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_func_ext_krb5_set_default_in_tkt_etypes=yes
++else
+ ac_cv_func_ext_krb5_set_default_in_tkt_etypes=no
fi
-
@@ -70503,7 +72412,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -63465,20 +24334,14 @@
+@@ -65878,20 +25568,14 @@
fi
@@ -70527,7 +72436,7 @@
/* end confdefs.h. */
/* Define krb5_set_default_tgs_enctypes to an innocuous variant, in case <limits.h> declares krb5_set_default_tgs_enctypes.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -63519,43 +24382,18 @@
+@@ -65932,43 +25616,18 @@
return 0;
}
_ACEOF
@@ -70577,7 +72486,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
_ACEOF
-@@ -63563,20 +24401,14 @@
+@@ -65976,20 +25635,14 @@
fi
@@ -70601,7 +72510,7 @@
/* end confdefs.h. */
/* Define krb5_set_default_tgs_ktypes to an innocuous variant, in case <limits.h> declares krb5_set_default_tgs_ktypes.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -63617,43 +24449,18 @@
+@@ -66030,43 +25683,18 @@
return 0;
}
_ACEOF
@@ -70651,7 +72560,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
_ACEOF
-@@ -63661,20 +24468,14 @@
+@@ -66074,20 +25702,14 @@
fi
@@ -70675,7 +72584,7 @@
/* end confdefs.h. */
/* Define krb5_principal2salt to an innocuous variant, in case <limits.h> declares krb5_principal2salt.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -63715,43 +24516,18 @@
+@@ -66128,43 +25750,18 @@
return 0;
}
_ACEOF
@@ -70725,7 +72634,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL2SALT 1
_ACEOF
-@@ -63759,20 +24535,14 @@
+@@ -66172,20 +25769,14 @@
fi
@@ -70749,7 +72658,7 @@
/* end confdefs.h. */
/* Define krb5_use_enctype to an innocuous variant, in case <limits.h> declares krb5_use_enctype.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -63813,43 +24583,18 @@
+@@ -66226,43 +25817,18 @@
return 0;
}
_ACEOF
@@ -70799,7 +72708,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_USE_ENCTYPE 1
_ACEOF
-@@ -63857,20 +24602,14 @@
+@@ -66270,20 +25836,14 @@
fi
@@ -70823,7 +72732,7 @@
/* end confdefs.h. */
/* Define krb5_string_to_key to an innocuous variant, in case <limits.h> declares krb5_string_to_key.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -63911,43 +24650,18 @@
+@@ -66324,43 +25884,18 @@
return 0;
}
_ACEOF
@@ -70873,7 +72782,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY 1
_ACEOF
-@@ -63955,20 +24669,14 @@
+@@ -66368,20 +25903,14 @@
fi
@@ -70897,7 +72806,7 @@
/* end confdefs.h. */
/* Define krb5_get_pw_salt to an innocuous variant, in case <limits.h> declares krb5_get_pw_salt.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64009,43 +24717,18 @@
+@@ -66422,43 +25951,18 @@
return 0;
}
_ACEOF
@@ -70947,7 +72856,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PW_SALT 1
_ACEOF
-@@ -64053,20 +24736,14 @@
+@@ -66466,20 +25970,14 @@
fi
@@ -70971,7 +72880,7 @@
/* end confdefs.h. */
/* Define krb5_string_to_key_salt to an innocuous variant, in case <limits.h> declares krb5_string_to_key_salt.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64107,43 +24784,18 @@
+@@ -66520,43 +26018,18 @@
return 0;
}
_ACEOF
@@ -71021,7 +72930,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY_SALT 1
_ACEOF
-@@ -64151,20 +24803,14 @@
+@@ -66564,20 +26037,14 @@
fi
@@ -71045,7 +72954,7 @@
/* end confdefs.h. */
/* Define krb5_auth_con_setkey to an innocuous variant, in case <limits.h> declares krb5_auth_con_setkey.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64205,43 +24851,18 @@
+@@ -66618,43 +26085,18 @@
return 0;
}
_ACEOF
@@ -71095,7 +73004,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETKEY 1
_ACEOF
-@@ -64249,20 +24870,14 @@
+@@ -66662,20 +26104,14 @@
fi
@@ -71119,7 +73028,7 @@
/* end confdefs.h. */
/* Define krb5_auth_con_setuseruserkey to an innocuous variant, in case <limits.h> declares krb5_auth_con_setuseruserkey.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64303,43 +24918,18 @@
+@@ -66716,43 +26152,18 @@
return 0;
}
_ACEOF
@@ -71169,7 +73078,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
_ACEOF
-@@ -64347,20 +24937,14 @@
+@@ -66760,20 +26171,14 @@
fi
@@ -71193,7 +73102,7 @@
/* end confdefs.h. */
/* Define krb5_locate_kdc to an innocuous variant, in case <limits.h> declares krb5_locate_kdc.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64401,43 +24985,18 @@
+@@ -66814,43 +26219,18 @@
return 0;
}
_ACEOF
@@ -71243,7 +73152,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_LOCATE_KDC 1
_ACEOF
-@@ -64445,20 +25004,14 @@
+@@ -66858,20 +26238,14 @@
fi
@@ -71267,7 +73176,7 @@
/* end confdefs.h. */
/* Define krb5_get_permitted_enctypes to an innocuous variant, in case <limits.h> declares krb5_get_permitted_enctypes.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64499,43 +25052,18 @@
+@@ -66912,43 +26286,18 @@
return 0;
}
_ACEOF
@@ -71317,7 +73226,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
_ACEOF
-@@ -64543,20 +25071,14 @@
+@@ -66956,20 +26305,14 @@
fi
@@ -71341,7 +73250,7 @@
/* end confdefs.h. */
/* Define krb5_get_default_in_tkt_etypes to an innocuous variant, in case <limits.h> declares krb5_get_default_in_tkt_etypes.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64597,43 +25119,18 @@
+@@ -67010,43 +26353,18 @@
return 0;
}
_ACEOF
@@ -71391,7 +73300,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -64641,20 +25138,14 @@
+@@ -67054,20 +26372,14 @@
fi
@@ -71415,7 +73324,7 @@
/* end confdefs.h. */
/* Define krb5_free_data_contents to an innocuous variant, in case <limits.h> declares krb5_free_data_contents.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64695,43 +25186,18 @@
+@@ -67108,43 +26420,18 @@
return 0;
}
_ACEOF
@@ -71465,7 +73374,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_DATA_CONTENTS 1
_ACEOF
-@@ -64739,20 +25205,14 @@
+@@ -67152,20 +26439,14 @@
fi
@@ -71489,7 +73398,7 @@
/* end confdefs.h. */
/* Define krb5_principal_get_comp_string to an innocuous variant, in case <limits.h> declares krb5_principal_get_comp_string.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64793,43 +25253,18 @@
+@@ -67206,43 +26487,18 @@
return 0;
}
_ACEOF
@@ -71539,7 +73448,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
_ACEOF
-@@ -64837,20 +25272,14 @@
+@@ -67250,20 +26506,14 @@
fi
@@ -71563,7 +73472,7 @@
/* end confdefs.h. */
/* Define krb5_free_unparsed_name to an innocuous variant, in case <limits.h> declares krb5_free_unparsed_name.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64891,43 +25320,18 @@
+@@ -67304,43 +26554,18 @@
return 0;
}
_ACEOF
@@ -71613,7 +73522,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_UNPARSED_NAME 1
_ACEOF
-@@ -64935,20 +25339,14 @@
+@@ -67348,20 +26573,14 @@
fi
@@ -71637,7 +73546,7 @@
/* end confdefs.h. */
/* Define krb5_free_keytab_entry_contents to an innocuous variant, in case <limits.h> declares krb5_free_keytab_entry_contents.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -64989,43 +25387,18 @@
+@@ -67402,43 +26621,18 @@
return 0;
}
_ACEOF
@@ -71687,7 +73596,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
_ACEOF
-@@ -65033,20 +25406,14 @@
+@@ -67446,20 +26640,14 @@
fi
@@ -71711,7 +73620,7 @@
/* end confdefs.h. */
/* Define krb5_kt_free_entry to an innocuous variant, in case <limits.h> declares krb5_kt_free_entry.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65087,43 +25454,18 @@
+@@ -67500,43 +26688,18 @@
return 0;
}
_ACEOF
@@ -71761,7 +73670,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KT_FREE_ENTRY 1
_ACEOF
-@@ -65131,20 +25473,14 @@
+@@ -67544,20 +26707,14 @@
fi
@@ -71785,7 +73694,7 @@
/* end confdefs.h. */
/* Define krb5_krbhst_init to an innocuous variant, in case <limits.h> declares krb5_krbhst_init.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65185,43 +25521,18 @@
+@@ -67598,43 +26755,18 @@
return 0;
}
_ACEOF
@@ -71835,7 +73744,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_INIT 1
_ACEOF
-@@ -65229,20 +25540,14 @@
+@@ -67642,20 +26774,14 @@
fi
@@ -71859,7 +73768,7 @@
/* end confdefs.h. */
/* Define krb5_krbhst_get_addrinfo to an innocuous variant, in case <limits.h> declares krb5_krbhst_get_addrinfo.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65283,43 +25588,18 @@
+@@ -67696,43 +26822,18 @@
return 0;
}
_ACEOF
@@ -71909,7 +73818,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
_ACEOF
-@@ -65327,20 +25607,14 @@
+@@ -67740,20 +26841,14 @@
fi
@@ -71933,7 +73842,7 @@
/* end confdefs.h. */
/* Define krb5_c_enctype_compare to an innocuous variant, in case <limits.h> declares krb5_c_enctype_compare.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65381,43 +25655,18 @@
+@@ -67794,43 +26889,18 @@
return 0;
}
_ACEOF
@@ -71983,7 +73892,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_ENCTYPE_COMPARE 1
_ACEOF
-@@ -65425,20 +25674,14 @@
+@@ -67838,20 +26908,14 @@
fi
@@ -72007,7 +73916,7 @@
/* end confdefs.h. */
/* Define krb5_enctypes_compatible_keys to an innocuous variant, in case <limits.h> declares krb5_enctypes_compatible_keys.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65479,43 +25722,18 @@
+@@ -67892,43 +26956,18 @@
return 0;
}
_ACEOF
@@ -72057,7 +73966,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
_ACEOF
-@@ -65523,20 +25741,14 @@
+@@ -67936,20 +26975,14 @@
fi
@@ -72081,12 +73990,10 @@
/* end confdefs.h. */
/* Define krb5_crypto_init to an innocuous variant, in case <limits.h> declares krb5_crypto_init.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65575,45 +25787,20 @@
- return krb5_crypto_init ();
- ;
+@@ -67990,43 +27023,18 @@
return 0;
--}
--_ACEOF
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -72108,8 +74015,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_ext_krb5_crypto_init=yes
else
@@ -72135,7 +74040,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_INIT 1
_ACEOF
-@@ -65621,20 +25808,14 @@
+@@ -68034,20 +27042,14 @@
fi
@@ -72159,7 +74064,7 @@
/* end confdefs.h. */
/* Define krb5_crypto_destroy to an innocuous variant, in case <limits.h> declares krb5_crypto_destroy.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65675,43 +25856,18 @@
+@@ -68088,43 +27090,18 @@
return 0;
}
_ACEOF
@@ -72209,7 +74114,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_DESTROY 1
_ACEOF
-@@ -65719,20 +25875,14 @@
+@@ -68132,20 +27109,14 @@
fi
@@ -72233,7 +74138,7 @@
/* end confdefs.h. */
/* Define krb5_decode_ap_req to an innocuous variant, in case <limits.h> declares krb5_decode_ap_req.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65773,43 +25923,18 @@
+@@ -68186,43 +27157,18 @@
return 0;
}
_ACEOF
@@ -72283,7 +74188,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_DECODE_AP_REQ 1
_ACEOF
-@@ -65817,20 +25942,14 @@
+@@ -68230,20 +27176,14 @@
fi
@@ -72307,7 +74212,7 @@
/* end confdefs.h. */
/* Define free_AP_REQ to an innocuous variant, in case <limits.h> declares free_AP_REQ.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65871,43 +25990,18 @@
+@@ -68284,43 +27224,18 @@
return 0;
}
_ACEOF
@@ -72357,7 +74262,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_FREE_AP_REQ 1
_ACEOF
-@@ -65915,20 +26009,14 @@
+@@ -68328,20 +27243,14 @@
fi
@@ -72381,7 +74286,7 @@
/* end confdefs.h. */
/* Define krb5_verify_checksum to an innocuous variant, in case <limits.h> declares krb5_verify_checksum.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -65969,43 +26057,18 @@
+@@ -68382,43 +27291,18 @@
return 0;
}
_ACEOF
@@ -72431,7 +74336,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_VERIFY_CHECKSUM 1
_ACEOF
-@@ -66013,20 +26076,14 @@
+@@ -68426,20 +27310,14 @@
fi
@@ -72455,7 +74360,7 @@
/* end confdefs.h. */
/* Define krb5_c_verify_checksum to an innocuous variant, in case <limits.h> declares krb5_c_verify_checksum.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66067,43 +26124,18 @@
+@@ -68480,43 +27358,18 @@
return 0;
}
_ACEOF
@@ -72505,7 +74410,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_VERIFY_CHECKSUM 1
_ACEOF
-@@ -66111,20 +26143,14 @@
+@@ -68524,20 +27377,14 @@
fi
@@ -72529,7 +74434,7 @@
/* end confdefs.h. */
/* Define krb5_principal_compare_any_realm to an innocuous variant, in case <limits.h> declares krb5_principal_compare_any_realm.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66165,43 +26191,18 @@
+@@ -68578,43 +27425,18 @@
return 0;
}
_ACEOF
@@ -72579,7 +74484,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
_ACEOF
-@@ -66209,20 +26210,14 @@
+@@ -68622,20 +27444,14 @@
fi
@@ -72603,7 +74508,7 @@
/* end confdefs.h. */
/* Define krb5_parse_name_norealm to an innocuous variant, in case <limits.h> declares krb5_parse_name_norealm.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66263,43 +26258,18 @@
+@@ -68676,43 +27492,18 @@
return 0;
}
_ACEOF
@@ -72653,7 +74558,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PARSE_NAME_NOREALM 1
_ACEOF
-@@ -66307,20 +26277,14 @@
+@@ -68720,20 +27511,14 @@
fi
@@ -72677,7 +74582,7 @@
/* end confdefs.h. */
/* Define krb5_princ_size to an innocuous variant, in case <limits.h> declares krb5_princ_size.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66361,43 +26325,18 @@
+@@ -68774,43 +27559,18 @@
return 0;
}
_ACEOF
@@ -72727,7 +74632,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINC_SIZE 1
_ACEOF
-@@ -66405,20 +26344,14 @@
+@@ -68818,20 +27578,14 @@
fi
@@ -72751,7 +74656,7 @@
/* end confdefs.h. */
/* Define krb5_get_init_creds_opt_set_pac_request to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_set_pac_request.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66459,43 +26392,18 @@
+@@ -68872,43 +27626,18 @@
return 0;
}
_ACEOF
@@ -72801,7 +74706,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
_ACEOF
-@@ -66503,20 +26411,14 @@
+@@ -68916,20 +27645,14 @@
fi
@@ -72825,7 +74730,7 @@
/* end confdefs.h. */
/* Define krb5_get_renewed_creds to an innocuous variant, in case <limits.h> declares krb5_get_renewed_creds.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66557,43 +26459,18 @@
+@@ -68970,43 +27693,18 @@
return 0;
}
_ACEOF
@@ -72875,7 +74780,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_RENEWED_CREDS 1
_ACEOF
-@@ -66601,20 +26478,14 @@
+@@ -69014,20 +27712,14 @@
fi
@@ -72899,7 +74804,7 @@
/* end confdefs.h. */
/* Define krb5_get_kdc_cred to an innocuous variant, in case <limits.h> declares krb5_get_kdc_cred.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66655,43 +26526,18 @@
+@@ -69068,43 +27760,18 @@
return 0;
}
_ACEOF
@@ -72949,7 +74854,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_KDC_CRED 1
_ACEOF
-@@ -66699,20 +26545,14 @@
+@@ -69112,20 +27779,14 @@
fi
@@ -72973,7 +74878,7 @@
/* end confdefs.h. */
/* Define krb5_free_error_contents to an innocuous variant, in case <limits.h> declares krb5_free_error_contents.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66753,43 +26593,18 @@
+@@ -69166,43 +27827,18 @@
return 0;
}
_ACEOF
@@ -73023,7 +74928,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_ERROR_CONTENTS 1
_ACEOF
-@@ -66797,20 +26612,14 @@
+@@ -69210,20 +27846,14 @@
fi
@@ -73047,7 +74952,7 @@
/* end confdefs.h. */
/* Define initialize_krb5_error_table to an innocuous variant, in case <limits.h> declares initialize_krb5_error_table.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66851,43 +26660,18 @@
+@@ -69264,43 +27894,18 @@
return 0;
}
_ACEOF
@@ -73097,7 +75002,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
_ACEOF
-@@ -66895,20 +26679,14 @@
+@@ -69308,20 +27913,14 @@
fi
@@ -73121,7 +75026,7 @@
/* end confdefs.h. */
/* Define krb5_get_init_creds_opt_alloc to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_alloc.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -66949,43 +26727,18 @@
+@@ -69362,43 +27961,18 @@
return 0;
}
_ACEOF
@@ -73171,7 +75076,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
_ACEOF
-@@ -66993,20 +26746,14 @@
+@@ -69406,20 +27980,14 @@
fi
@@ -73195,7 +75100,7 @@
/* end confdefs.h. */
/* Define krb5_get_init_creds_opt_free to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_free.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -67047,43 +26794,18 @@
+@@ -69460,43 +28028,18 @@
return 0;
}
_ACEOF
@@ -73245,7 +75150,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
_ACEOF
-@@ -67091,20 +26813,14 @@
+@@ -69504,20 +28047,14 @@
fi
@@ -73269,7 +75174,7 @@
/* end confdefs.h. */
/* Define krb5_get_init_creds_opt_get_error to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_get_error.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -67145,43 +26861,18 @@
+@@ -69558,43 +28095,18 @@
return 0;
}
_ACEOF
@@ -73319,7 +75224,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
_ACEOF
-@@ -67189,20 +26880,14 @@
+@@ -69602,20 +28114,14 @@
fi
@@ -73343,7 +75248,7 @@
/* end confdefs.h. */
/* Define krb5_enctype_to_string to an innocuous variant, in case <limits.h> declares krb5_enctype_to_string.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -67243,43 +26928,18 @@
+@@ -69656,43 +28162,18 @@
return 0;
}
_ACEOF
@@ -73393,7 +75298,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPE_TO_STRING 1
_ACEOF
-@@ -67287,20 +26947,14 @@
+@@ -69700,20 +28181,14 @@
fi
@@ -73417,7 +75322,7 @@
/* end confdefs.h. */
/* Define krb5_fwd_tgt_creds to an innocuous variant, in case <limits.h> declares krb5_fwd_tgt_creds.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -67341,43 +26995,18 @@
+@@ -69754,43 +28229,18 @@
return 0;
}
_ACEOF
@@ -73467,7 +75372,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FWD_TGT_CREDS 1
_ACEOF
-@@ -67385,20 +27014,14 @@
+@@ -69798,20 +28248,14 @@
fi
@@ -73491,7 +75396,7 @@
/* end confdefs.h. */
/* Define krb5_auth_con_set_req_cksumtype to an innocuous variant, in case <limits.h> declares krb5_auth_con_set_req_cksumtype.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -67439,63 +27062,33 @@
+@@ -69852,43 +28296,18 @@
return 0;
}
_ACEOF
@@ -73541,10 +75446,462 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
_ACEOF
+@@ -69896,20 +28315,14 @@
+ fi
+
+-
+-
+ ac_check_func_ext_save_LIBS=$LIBS
+ LIBS="$KRB5_LIBS $LIBS"
+- { $as_echo "$as_me:$LINENO: checking for krb5_get_creds_opt_alloc" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds_opt_alloc" >&5
+ $as_echo_n "checking for krb5_get_creds_opt_alloc... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_creds_opt_alloc+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_creds_opt_alloc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ /* Define krb5_get_creds_opt_alloc to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_alloc.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+@@ -69950,43 +28363,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_ext_krb5_get_creds_opt_alloc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_ext_krb5_get_creds_opt_alloc=no
++ ac_cv_func_ext_krb5_get_creds_opt_alloc=no
fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_creds_opt_alloc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_creds_opt_alloc" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_creds_opt_alloc" >&6; }
+ LIBS=$ac_check_func_ext_save_LIBS
+- if test $ac_cv_func_ext_krb5_get_creds_opt_alloc = yes; then
++ if test $ac_cv_func_ext_krb5_get_creds_opt_alloc = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDS_OPT_ALLOC 1
+ _ACEOF
+@@ -69994,20 +28382,14 @@
+ fi
+
-
+-
+ ac_check_func_ext_save_LIBS=$LIBS
+ LIBS="$KRB5_LIBS $LIBS"
+- { $as_echo "$as_me:$LINENO: checking for krb5_get_creds_opt_set_impersonate" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds_opt_set_impersonate" >&5
+ $as_echo_n "checking for krb5_get_creds_opt_set_impersonate... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_creds_opt_set_impersonate+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_creds_opt_set_impersonate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ /* Define krb5_get_creds_opt_set_impersonate to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_set_impersonate.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+@@ -70048,43 +28430,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_ext_krb5_get_creds_opt_set_impersonate=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_ext_krb5_get_creds_opt_set_impersonate=no
++ ac_cv_func_ext_krb5_get_creds_opt_set_impersonate=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_creds_opt_set_impersonate" >&6; }
+ LIBS=$ac_check_func_ext_save_LIBS
+- if test $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate = yes; then
++ if test $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE 1
+ _ACEOF
+@@ -70092,20 +28449,14 @@
+ fi
+
+
+-
+-
+ ac_check_func_ext_save_LIBS=$LIBS
+ LIBS="$KRB5_LIBS $LIBS"
+- { $as_echo "$as_me:$LINENO: checking for krb5_get_creds" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds" >&5
+ $as_echo_n "checking for krb5_get_creds... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_creds+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_creds+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ /* Define krb5_get_creds to an innocuous variant, in case <limits.h> declares krb5_get_creds.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+@@ -70146,43 +28497,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_ext_krb5_get_creds=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_ext_krb5_get_creds=no
++ ac_cv_func_ext_krb5_get_creds=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_creds" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_creds" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_creds" >&6; }
+ LIBS=$ac_check_func_ext_save_LIBS
+- if test $ac_cv_func_ext_krb5_get_creds = yes; then
++ if test $ac_cv_func_ext_krb5_get_creds = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDS 1
+ _ACEOF
+@@ -70190,20 +28516,14 @@
+ fi
+
+
+-
+-
+ ac_check_func_ext_save_LIBS=$LIBS
+ LIBS="$KRB5_LIBS $LIBS"
+- { $as_echo "$as_me:$LINENO: checking for krb5_get_credentials_for_user" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_credentials_for_user" >&5
+ $as_echo_n "checking for krb5_get_credentials_for_user... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_credentials_for_user+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_credentials_for_user+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ /* Define krb5_get_credentials_for_user to an innocuous variant, in case <limits.h> declares krb5_get_credentials_for_user.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+@@ -70244,207 +28564,61 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_ext_krb5_get_credentials_for_user=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_ext_krb5_get_credentials_for_user=no
++ ac_cv_func_ext_krb5_get_credentials_for_user=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_credentials_for_user" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_credentials_for_user" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_credentials_for_user" >&6; }
+ LIBS=$ac_check_func_ext_save_LIBS
+- if test $ac_cv_func_ext_krb5_get_credentials_for_user = yes; then
++ if test $ac_cv_func_ext_krb5_get_credentials_for_user = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDENTIALS_FOR_USER 1
+ _ACEOF
+
+ fi
+-
+ # MIT krb5 1.8 does not expose this call (yet)
+- { $as_echo "$as_me:$LINENO: checking whether krb5_get_credentials_for_user is declared" >&5
+-$as_echo_n "checking whether krb5_get_credentials_for_user is declared... " >&6; }
+-if test "${ac_cv_have_decl_krb5_get_credentials_for_user+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <krb5.h>
+-
+-int
+-main ()
+-{
+-#ifndef krb5_get_credentials_for_user
+- (void) krb5_get_credentials_for_user;
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_have_decl_krb5_get_credentials_for_user=yes
++ ac_fn_c_check_decl "$LINENO" "krb5_get_credentials_for_user" "ac_cv_have_decl_krb5_get_credentials_for_user" "#include <krb5.h>
++"
++if test "x$ac_cv_have_decl_krb5_get_credentials_for_user" = x""yes; then :
++ ac_have_decl=1
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_have_decl_krb5_get_credentials_for_user=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_have_decl=0
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_krb5_get_credentials_for_user" >&5
+-$as_echo "$ac_cv_have_decl_krb5_get_credentials_for_user" >&6; }
+-if test "x$ac_cv_have_decl_krb5_get_credentials_for_user" = x""yes; then
+
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER 1
+-_ACEOF
+-
+-
+-else
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER 0
++#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER $ac_have_decl
+ _ACEOF
+
+
+-fi
+-
+-
+-
+ # MIT krb5 1.7beta3 (in Ubuntu Karmic) does not have this declaration
+ # but does have the symbol
+- { $as_echo "$as_me:$LINENO: checking whether krb5_auth_con_set_req_cksumtype is declared" >&5
+-$as_echo_n "checking whether krb5_auth_con_set_req_cksumtype is declared... " >&6; }
+-if test "${ac_cv_have_decl_krb5_auth_con_set_req_cksumtype+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <krb5.h>
+-
+-int
+-main ()
+-{
+-#ifndef krb5_auth_con_set_req_cksumtype
+- (void) krb5_auth_con_set_req_cksumtype;
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_cv_have_decl_krb5_auth_con_set_req_cksumtype=yes
++ ac_fn_c_check_decl "$LINENO" "krb5_auth_con_set_req_cksumtype" "ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" "#include <krb5.h>
++"
++if test "x$ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" = x""yes; then :
++ ac_have_decl=1
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_have_decl_krb5_auth_con_set_req_cksumtype=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_have_decl=0
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" >&5
+-$as_echo "$ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" >&6; }
+-if test "x$ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" = x""yes; then
+
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
+-_ACEOF
+-
+-
+-else
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 0
++#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE $ac_have_decl
+ _ACEOF
+
+
+-fi
+-
+-
+-
LIBS="$KRB5_LIBS $LIBS"
- { $as_echo "$as_me:$LINENO: checking whether krb5_ticket contains kvno and enctype" >&5
@@ -73564,7 +75921,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67515,57 +27108,30 @@
+@@ -70464,57 +28638,30 @@
return 0;
}
_ACEOF
@@ -73629,7 +75986,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67581,58 +27147,31 @@
+@@ -70530,58 +28677,31 @@
return 0;
}
_ACEOF
@@ -73695,7 +76052,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67644,36 +27183,15 @@
+@@ -70593,36 +28713,15 @@
return 0;
}
_ACEOF
@@ -73735,7 +76092,7 @@
$as_echo "$smb_krb5_cv_verify_checksum" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -67681,17 +27199,13 @@
+@@ -70630,17 +28729,13 @@
_ACEOF
@@ -73756,7 +76113,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67702,56 +27216,29 @@
+@@ -70651,56 +28746,29 @@
return 0;
}
_ACEOF
@@ -73820,7 +76177,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67762,56 +27249,29 @@
+@@ -70711,56 +28779,29 @@
return 0;
}
_ACEOF
@@ -73884,7 +76241,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67822,56 +27282,29 @@
+@@ -70771,56 +28812,29 @@
return 0;
}
_ACEOF
@@ -73948,7 +76305,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67882,56 +27315,29 @@
+@@ -70831,56 +28845,29 @@
return 0;
}
_ACEOF
@@ -74012,7 +76369,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67942,56 +27348,29 @@
+@@ -70891,56 +28878,29 @@
return 0;
}
_ACEOF
@@ -74076,7 +76433,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68002,56 +27381,29 @@
+@@ -70951,56 +28911,29 @@
return 0;
}
_ACEOF
@@ -74140,7 +76497,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68062,56 +27414,29 @@
+@@ -71011,56 +28944,29 @@
return 0;
}
_ACEOF
@@ -74204,7 +76561,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68122,55 +27447,28 @@
+@@ -71071,55 +28977,28 @@
return 0;
}
_ACEOF
@@ -74267,7 +76624,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68181,56 +27479,29 @@
+@@ -71130,56 +29009,29 @@
return 0;
}
_ACEOF
@@ -74331,7 +76688,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68241,56 +27512,29 @@
+@@ -71190,56 +29042,29 @@
return 0;
}
_ACEOF
@@ -74395,7 +76752,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68301,56 +27545,29 @@
+@@ -71250,56 +29075,29 @@
return 0;
}
_ACEOF
@@ -74459,7 +76816,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68361,56 +27578,29 @@
+@@ -71310,56 +29108,29 @@
return 0;
}
_ACEOF
@@ -74523,7 +76880,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68421,47 +27611,22 @@
+@@ -71370,47 +29141,22 @@
return 0;
}
_ACEOF
@@ -74577,7 +76934,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68472,58 +27637,31 @@
+@@ -71421,58 +29167,31 @@
return 0;
}
_ACEOF
@@ -74643,7 +77000,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68534,56 +27672,29 @@
+@@ -71483,56 +29202,29 @@
return 0;
}
_ACEOF
@@ -74707,7 +77064,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68594,56 +27705,29 @@
+@@ -71543,56 +29235,29 @@
return 0;
}
_ACEOF
@@ -74771,7 +77128,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68654,56 +27738,29 @@
+@@ -71603,56 +29268,29 @@
return 0;
}
_ACEOF
@@ -74835,7 +77192,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68714,56 +27771,29 @@
+@@ -71663,56 +29301,29 @@
return 0;
}
_ACEOF
@@ -74899,7 +77256,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68774,61 +27804,30 @@
+@@ -71723,61 +29334,30 @@
return 0;
}
_ACEOF
@@ -74970,7 +77327,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68839,56 +27838,29 @@
+@@ -71788,56 +29368,29 @@
return 0;
}
_ACEOF
@@ -75034,7 +77391,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68899,56 +27871,29 @@
+@@ -71848,56 +29401,29 @@
return 0;
}
_ACEOF
@@ -75098,7 +77455,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68959,65 +27904,35 @@
+@@ -71908,65 +29434,35 @@
return 0;
}
_ACEOF
@@ -75175,7 +77532,7 @@
/* end confdefs.h. */
#include<krb5.h>
-@@ -69030,65 +27945,32 @@
+@@ -71979,65 +29475,32 @@
return krb5_kt_resolve(context, "WRFILE:api", &keytab);
}
_ACEOF
@@ -75250,7 +77607,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69102,56 +27984,29 @@
+@@ -72051,56 +29514,29 @@
return 0;
}
_ACEOF
@@ -75314,7 +77671,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69162,56 +28017,29 @@
+@@ -72111,56 +29547,29 @@
return 0;
}
_ACEOF
@@ -75378,7 +77735,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69223,49 +28051,26 @@
+@@ -72172,49 +29581,26 @@
return 0;
}
_ACEOF
@@ -75434,7 +77791,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -69279,20 +28084,13 @@
+@@ -72228,20 +29614,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -75460,7 +77817,7 @@
/* end confdefs.h. */
#include <stdlib.h>
-@@ -69306,42 +28104,15 @@
+@@ -72255,42 +29634,15 @@
}
_ACEOF
@@ -75507,7 +77864,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -69353,20 +28124,18 @@
+@@ -72302,20 +29654,18 @@
export LDFLAGS;
fi
@@ -75532,7 +77889,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -69380,20 +28149,13 @@
+@@ -72329,20 +29679,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -75558,7 +77915,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -69404,42 +28166,15 @@
+@@ -72353,42 +29696,15 @@
}
_ACEOF
@@ -75605,7 +77962,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -69451,29 +28186,23 @@
+@@ -72400,29 +29716,23 @@
export LDFLAGS;
fi
@@ -75640,7 +77997,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69484,61 +28213,30 @@
+@@ -72433,61 +29743,30 @@
return 0;
}
_ACEOF
@@ -75711,7 +78068,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69549,47 +28247,20 @@
+@@ -72498,47 +29777,20 @@
return 0;
}
_ACEOF
@@ -75765,7 +78122,7 @@
fi
-@@ -69601,7 +28272,7 @@
+@@ -72550,7 +29802,7 @@
#
#
if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -75774,7 +78131,7 @@
$as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
use_ads=no
fi
-@@ -69609,7 +28280,7 @@
+@@ -72558,7 +29810,7 @@
if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -a \
x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes"
then
@@ -75783,7 +78140,7 @@
$as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -69617,7 +28288,7 @@
+@@ -72566,7 +29818,7 @@
if test x"$ac_cv_func_ext_krb5_get_permitted_enctypes" != x"yes" -a \
x"$ac_cv_func_ext_krb5_get_default_in_tkt_etypes" != x"yes"
then
@@ -75792,7 +78149,7 @@
$as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -69625,7 +28296,7 @@
+@@ -72574,7 +29826,7 @@
if test x"$ac_cv_func_ext_krb5_kt_free_entry" != x"yes" -a \
x"$ac_cv_func_ext_krb5_free_keytab_entry_contents" != x"yes"
then
@@ -75801,7 +78158,7 @@
$as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69633,7 +28304,7 @@
+@@ -72582,7 +29834,7 @@
if test x"$ac_cv_func_ext_krb5_c_verify_checksum" != x"yes" -a \
x"$ac_cv_func_ext_krb5_verify_checksum" != x"yes"
then
@@ -75810,7 +78167,7 @@
$as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69645,14 +28316,14 @@
+@@ -72594,14 +29846,14 @@
if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
then
@@ -75827,7 +78184,7 @@
$as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69661,29 +28332,21 @@
+@@ -72610,29 +29862,21 @@
if test x"$use_ads" = x"yes"; then
@@ -75862,7 +78219,7 @@
$as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
fi
-@@ -69709,9 +28372,9 @@
+@@ -72658,9 +29902,9 @@
KRB5_LIBS=""
with_ads_support=no
fi
@@ -75874,7 +78231,7 @@
$as_echo "$use_ads" >&6; }
LIBS="$ac_save_LIBS"
-@@ -69723,23 +28386,17 @@
+@@ -72672,23 +29916,17 @@
@@ -75901,7 +78258,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -69757,54 +28414,28 @@
+@@ -72706,54 +29944,28 @@
return 0;
}
_ACEOF
@@ -75963,7 +78320,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSCD 1
_ACEOF
-@@ -69819,7 +28450,6 @@
+@@ -72768,7 +29980,6 @@
fi
@@ -75971,7 +78328,7 @@
PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
-@@ -69827,12 +28457,12 @@
+@@ -72776,12 +29987,12 @@
# Compile with DNS Updates support?
with_dnsupdate_support=no
@@ -75986,7 +78343,7 @@
withval=$with_dnsupdate; case "$withval" in
yes|no)
with_dnsupdate_support=$withval
-@@ -69841,7 +28471,7 @@
+@@ -72790,7 +30001,7 @@
fi
@@ -75995,7 +78352,7 @@
$as_echo "$with_dnsupdate_support" >&6; }
if test x"$with_dnsupdate_support" != x"no"; then
-@@ -69855,151 +28485,12 @@
+@@ -72804,151 +30015,12 @@
##################################################################
# then test for uuid.h (necessary to generate unique DNS keynames
# (uuid.h is required for this test)
@@ -76152,7 +78509,7 @@
_ACEOF
fi
-@@ -70009,11 +28500,9 @@
+@@ -72958,11 +30030,9 @@
if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76166,7 +78523,7 @@
$as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70029,102 +28518,12 @@
+@@ -72978,102 +30048,12 @@
UUID_LIBS=""
@@ -76274,7 +78631,7 @@
_ACEOF
# uuid_generate was found in libc or existing $LIBS
-@@ -70141,9 +28540,7 @@
+@@ -73090,9 +30070,7 @@
with_dnsupdate_support=yes
@@ -76285,7 +78642,7 @@
-@@ -70156,11 +28553,9 @@
+@@ -73105,11 +30083,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76299,7 +78656,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70169,18 +28564,14 @@
+@@ -73118,18 +30094,14 @@
;;
*)
# uuid_generate was not found, try adding libuuid
@@ -76321,7 +78678,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -70198,43 +28589,18 @@
+@@ -73147,43 +30119,18 @@
return 0;
}
_ACEOF
@@ -76371,7 +78728,7 @@
LIBS="-luuid $LIBS"
-@@ -70250,9 +28616,7 @@
+@@ -73199,9 +30146,7 @@
with_dnsupdate_support=yes
@@ -76382,7 +78739,7 @@
-@@ -70262,11 +28626,9 @@
+@@ -73211,11 +30156,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76396,7 +78753,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70286,28 +28648,26 @@
+@@ -73235,28 +30178,26 @@
#################################################
# check for automount support
@@ -76431,13 +78788,13 @@
$as_echo "no" >&6; }
fi
-@@ -70318,34 +28678,30 @@
+@@ -73267,34 +30208,30 @@
CIFSMOUNT_PROGS=""
INSTALL_CIFSMOUNT=""
UNINSTALL_CIFSMOUNT=""
--{ $as_echo "$as_me:$LINENO: checking whether to build mount.cifs and umount.cifs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build mount.cifs and umount.cifs" >&5
- $as_echo_n "checking whether to build mount.cifs and umount.cifs... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking whether to build mount.cifs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build mount.cifs" >&5
+ $as_echo_n "checking whether to build mount.cifs... " >&6; }
# Check whether --with-cifsmount was given.
-if test "${with_cifsmount+set}" = set; then
@@ -76460,7 +78817,7 @@
-_ACEOF
+$as_echo "#define WITH_CIFSMOUNT 1" >>confdefs.h
- CIFSMOUNT_PROGS="bin/mount.cifs bin/umount.cifs"
+ CIFSMOUNT_PROGS="bin/mount.cifs"
INSTALL_CIFSMOUNT="installcifsmount"
UNINSTALL_CIFSMOUNT="uninstallcifsmount"
;;
@@ -76472,7 +78829,7 @@
;;
esac
;;
-@@ -70353,173 +28709,32 @@
+@@ -73302,19 +30239,17 @@
else
case "$host_os" in
*linux*)
@@ -76485,19 +78842,66 @@
-_ACEOF
+$as_echo "#define WITH_CIFSMOUNT 1" >>confdefs.h
- CIFSMOUNT_PROGS="bin/mount.cifs bin/umount.cifs"
-- INSTALL_CIFSMOUNT="installcifsmount"
-- UNINSTALL_CIFSMOUNT="uninstallcifsmount"
-- ;;
-- *)
+ CIFSMOUNT_PROGS="bin/mount.cifs"
+ INSTALL_CIFSMOUNT="installcifsmount"
+ UNINSTALL_CIFSMOUNT="uninstallcifsmount"
+ ;;
+ *)
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- ;;
-- esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ ;;
+ esac
+@@ -73325,192 +30260,49 @@
+ CIFSUMOUNT_PROGS=""
+ INSTALL_CIFSUMOUNT=""
+ UNINSTALL_CIFSUMOUNT=""
+-{ $as_echo "$as_me:$LINENO: checking whether to build umount.cifs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build umount.cifs" >&5
+ $as_echo_n "checking whether to build umount.cifs... " >&6; }
+
+ # Check whether --with-cifsumount was given.
+-if test "${with_cifsumount+set}" = set; then
++if test "${with_cifsumount+set}" = set; then :
+ withval=$with_cifsumount; case "$withval" in
+ yes)
+ case "$host_os" in
+ *linux*)
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_CIFSUMOUNT 1
+-_ACEOF
++$as_echo "#define WITH_CIFSUMOUNT 1" >>confdefs.h
+
+ CIFSUMOUNT_PROGS="bin/umount.cifs"
+ INSTALL_CIFSUMOUNT="installcifsumount"
+ UNINSTALL_CIFSUMOUNT="uninstallcifsumount"
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: not on a linux system!" >&5
+-$as_echo "$as_me: error: not on a linux system!" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "not on a linux system!" "$LINENO" 5
+ ;;
+ esac
+ ;;
+ *)
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ ;;
+ esac
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+
+ fi
-
--fi
-
--
-#################################################
-# check for cifs.upcall support
-
@@ -76638,16 +79042,8 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+ INSTALL_CIFSMOUNT="installcifsmount"
-+ UNINSTALL_CIFSMOUNT="uninstallcifsmount"
-+ ;;
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ ;;
-+ esac
-
- fi
+-
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
@@ -76665,7 +79061,7 @@
_ACEOF
HAVE_KEYUTILS_H=1
else
-@@ -70531,34 +28746,28 @@
+@@ -73522,34 +30314,28 @@
CIFSUPCALL_PROGS=""
INSTALL_CIFSUPCALL=""
UNINSTALL_CIFSUPCALL=""
@@ -76707,7 +79103,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70566,9 +28775,7 @@
+@@ -73557,9 +30343,7 @@
fi
;;
*)
@@ -76718,7 +79114,7 @@
;;
esac
;;
-@@ -70577,18 +28784,16 @@
+@@ -73568,18 +30352,16 @@
case "$host_os" in
*linux*)
if test x"$use_ads" != x"yes"; then
@@ -76741,7 +79137,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70596,7 +28801,7 @@
+@@ -73587,7 +30369,7 @@
fi
;;
*)
@@ -76750,10 +79146,10 @@
$as_echo "no" >&6; }
;;
esac
-@@ -70613,11 +28818,11 @@
+@@ -73604,11 +30386,11 @@
with_pam_for_crypt=no
- try_pam=no
+ try_pam=auto
-{ $as_echo "$as_me:$LINENO: checking whether to try PAM support" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try PAM support" >&5
$as_echo_n "checking whether to try PAM support... " >&6; }
@@ -76762,9 +79158,9 @@
-if test "${with_pam+set}" = set; then
+if test "${with_pam+set}" = set; then :
withval=$with_pam; case "$withval" in
- yes|no)
+ yes|no|auto)
try_pam=$withval
-@@ -70626,7 +28831,7 @@
+@@ -73617,7 +30399,7 @@
fi
@@ -76773,7 +79169,7 @@
$as_echo "$try_pam" >&6; }
use_pam=no
-@@ -70637,150 +28842,12 @@
+@@ -73628,150 +30410,12 @@
# Most systems have PAM headers in /usr/include/security, but Darwin
# has them in /usr/include/pam.
@@ -76930,7 +79326,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -70792,9 +28859,7 @@
+@@ -73783,9 +30427,7 @@
if test x"$ac_cv_header_security_pam_appl_h" != x"yes" -a \
x"$ac_cv_header_pam_pam_appl_h" != x"yes"; then
if test x"${try_pam}" = x"yes";then
@@ -76941,7 +79337,7 @@
fi
use_pam=no
create_pam_modules=no
-@@ -70802,23 +28867,17 @@
+@@ -73793,23 +30435,17 @@
@@ -76968,7 +79364,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -70836,54 +28895,28 @@
+@@ -73827,54 +30463,28 @@
return 0;
}
_ACEOF
@@ -77030,7 +79426,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -70898,34 +28931,18 @@
+@@ -73889,34 +30499,18 @@
fi
@@ -77070,7 +79466,7 @@
#if HAVE_SECURITY_PAM_APPL_H
#include <security/pam_appl.h>
#endif
-@@ -70933,44 +28950,9 @@
+@@ -73924,44 +30518,9 @@
#include <pam/pam_appl.h>
#endif
@@ -77118,7 +79514,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -70982,179 +28964,33 @@
+@@ -73973,179 +30532,33 @@
if test x"$ac_cv_header_security_pam_modules_h" = x"no" -a \
x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
if test x"${try_pam}" = x"yes";then
@@ -77308,7 +79704,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -71163,150 +28999,12 @@
+@@ -74154,150 +30567,12 @@
done
@@ -77465,7 +79861,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -71317,19 +29015,14 @@
+@@ -74308,19 +30583,14 @@
@@ -77488,7 +79884,7 @@
/* end confdefs.h. */
/* Define pam_vsyslog to an innocuous variant, in case <limits.h> declares pam_vsyslog.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -71370,62 +29063,36 @@
+@@ -74361,72 +30631,42 @@
return 0;
}
_ACEOF
@@ -77562,10 +79958,60 @@
$as_echo "$create_pam_modules" >&6; }
fi # try_pam != no
-@@ -71434,26 +29101,22 @@
- PAM_MODULES=""
- INSTALL_PAM_MODULES=""
+ #################################################
+ # check for PAM_RADIO_TYPE
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #if (!defined(LINUX))
+@@ -74464,36 +30704,11 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PAM_RADIO_TYPE 1
+-_ACEOF
+-
+-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_PAM_RADIO_TYPE 1" >>confdefs.h
+
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ #################################################
+@@ -74503,19 +30718,17 @@
UNINSTALL_PAM_MODULES=""
+
+ try_pam_smbpass=auto
-{ $as_echo "$as_me:$LINENO: checking whether to use pam_smbpass" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use pam_smbpass" >&5
$as_echo_n "checking whether to use pam_smbpass... " >&6; }
@@ -77574,42 +80020,46 @@
-if test "${with_pam_smbpass+set}" = set; then
+if test "${with_pam_smbpass+set}" = set; then :
withval=$with_pam_smbpass; 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; }
+ yes|no|auto)
+ try_pam_smbpass=$withval
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: valid options are yes,no,auto" >&5
+-$as_echo "$as_me: error: valid options are yes,no,auto" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "valid options are yes,no,auto" "$LINENO" 5
+ ;;
+ esac
- # Conditions under which pam_smbpass should not be built.
-
- if test x"$BLDSHARED" != x"true"; then
-- { { $as_echo "$as_me:$LINENO: error: No support for shared modules" >&5
+@@ -74529,16 +30742,12 @@
+ # Conditions under which pam_smbpass can't be built.
+ if test x"$BLDSHARED" != xtrue ; then
+ if test x"${try_pam_smbpass}" = xyes ; then
+- { { $as_echo "$as_me:$LINENO: error: No support for shared modules" >&5
-$as_echo "$as_me: error: No support for shared modules" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "No support for shared modules" "$LINENO" 5
- elif test x"$create_pam_modules" != x"yes"; then
-- { { $as_echo "$as_me:$LINENO: error: No support for PAM MODULES" >&5
++ as_fn_error "No support for shared modules" "$LINENO" 5
+ fi
+ use_pam_smbpass=no
+ elif test x"$create_pam_modules" != xyes ; then
+ if test x"${try_pam_smbpass}" = xyes ; then
+- { { $as_echo "$as_me:$LINENO: error: No support for PAM MODULES" >&5
-$as_echo "$as_me: error: No support for PAM MODULES" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "No support for PAM MODULES" "$LINENO" 5
- else
- PAM_MODULES="pam_smbpass"
- INSTALL_PAM_MODULES="installpammodules"
-@@ -71461,12 +29124,12 @@
- fi
- ;;
- *)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- ;;
- esac
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
++ as_fn_error "No support for PAM MODULES" "$LINENO" 5
+ fi
+ use_pam_smbpass=no
+ fi
+@@ -74549,7 +30758,7 @@
+ UNINSTALL_PAM_MODULES="uninstallpammodules"
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $use_pam_smbpass" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_pam_smbpass" >&5
+ $as_echo "$use_pam_smbpass" >&6; }
- fi
-@@ -71480,98 +29143,63 @@
+
+@@ -74560,98 +30769,63 @@
## $with_pam_for_crypt variable as above --jerry
##
if test $with_pam_for_crypt = no; then
@@ -77724,7 +80174,7 @@
$as_echo "no" >&6; }
fi
-@@ -71579,28 +29207,26 @@
+@@ -74659,28 +30833,26 @@
#################################################
# check for syslog logging
@@ -77759,7 +80209,7 @@
$as_echo "no" >&6; }
fi
-@@ -71608,16 +29234,14 @@
+@@ -74688,16 +30860,14 @@
#################################################
# check for custom syslog facility
@@ -77779,7 +80229,7 @@
else
if test "$withval" != "yes" ; then
syslog_facility="$withval"
-@@ -71642,14 +29266,14 @@
+@@ -74722,14 +30892,14 @@
samba_cv_TRY_SYS_QUOTAS=auto
samba_cv_SYSQUOTA_FOUND=no
@@ -77797,7 +80247,7 @@
$as_echo "yes" >&6; }
samba_cv_WITH_QUOTAS=yes
samba_cv_TRY_QUOTAS=yes
-@@ -71658,7 +29282,7 @@
+@@ -74738,7 +30908,7 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
auto)
@@ -77806,7 +80256,7 @@
$as_echo "auto" >&6; }
samba_cv_WITH_QUOTAS=auto
samba_cv_TRY_QUOTAS=auto
-@@ -71667,719 +29291,165 @@
+@@ -74747,719 +30917,165 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
no)
@@ -77819,46 +80269,53 @@
;;
*)
- { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_QUOTAS}" >&5
--$as_echo "${samba_cv_TRY_QUOTAS}" >&6; }
-- ;;
-- esac
--else
-- { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_QUOTAS}" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_QUOTAS}" >&5
$as_echo "${samba_cv_TRY_QUOTAS}" >&6; }
--
--fi
--
--
+ ;;
+ esac
+ else
+- { $as_echo "$as_me:$LINENO: result: ${samba_cv_TRY_QUOTAS}" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_QUOTAS}" >&5
+ $as_echo "${samba_cv_TRY_QUOTAS}" >&6; }
+
+ fi
+
+
-{ $as_echo "$as_me:$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 "$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.
-if test "${with_sys_quotas+set}" = set; then
-- withval=$with_sys_quotas; case "$withval" in
-- yes)
++if test "${with_sys_quotas+set}" = set; then :
+ withval=$with_sys_quotas; case "$withval" in
+ yes)
- { $as_echo "$as_me:$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 "$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 "$as_me:$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 "$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 "$as_me:$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: no" >&5
+ $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; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
+ $as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
;;
esac
-else
@@ -78163,17 +80620,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_QUOTAS}" >&5
-+$as_echo "${samba_cv_TRY_QUOTAS}" >&6; }
-
+-
- 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: )
@@ -78182,19 +80636,7 @@
- { $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
-+{ $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.
-+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;}
@@ -78214,36 +80656,20 @@
-## ---------------------------------------- ##
-_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
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${samba_cv_TRY_SYS_QUOTAS}" >&5
+$as_echo "${samba_cv_TRY_SYS_QUOTAS}" >&6; }
@@ -78636,7 +81062,7 @@
_ACEOF
fi
-@@ -72389,17 +29459,13 @@
+@@ -75469,17 +31085,13 @@
if test x"$samba_cv_found_xfs_header" != x"yes"; then
# if we have xfs quota support <sys/quota.h> (IRIX) we should use it
@@ -78657,7 +81083,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -72419,35 +29485,14 @@
+@@ -75499,35 +31111,14 @@
return 0;
}
_ACEOF
@@ -78696,7 +81122,7 @@
$as_echo "$samba_cv_HAVE_SYS_QUOTA_XFS" >&6; }
if test "$samba_cv_HAVE_SYS_QUOTA_XFS"x = "yes"x; then
samba_cv_found_xfs_header=yes
-@@ -72455,17 +29500,13 @@
+@@ -75535,17 +31126,13 @@
fi
# if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -78717,7 +81143,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -72483,41 +29524,18 @@
+@@ -75563,41 +31150,18 @@
return 0;
}
_ACEOF
@@ -78763,7 +81189,7 @@
fi
-@@ -72525,9 +29543,9 @@
+@@ -75605,9 +31169,9 @@
# look for a working quota system
if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -78775,7 +81201,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72541,14 +29559,10 @@
+@@ -75621,14 +31185,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -78792,7 +81218,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4A 1
-@@ -72556,42 +29570,15 @@
+@@ -75636,42 +31196,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -78839,7 +81265,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72603,23 +29590,21 @@
+@@ -75683,23 +31216,21 @@
export LDFLAGS;
fi
@@ -78867,7 +81293,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72633,14 +29618,10 @@
+@@ -75713,14 +31244,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -78884,7 +81310,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4B 1
-@@ -72648,42 +29629,15 @@
+@@ -75728,42 +31255,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -78931,7 +81357,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72695,24 +29649,22 @@
+@@ -75775,24 +31275,22 @@
export LDFLAGS;
fi
@@ -78960,7 +81386,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72726,14 +29678,10 @@
+@@ -75806,14 +31304,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -78977,7 +81403,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_3 1
-@@ -72741,42 +29689,15 @@
+@@ -75821,42 +31315,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -79024,7 +81450,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72788,15 +29709,13 @@
+@@ -75868,15 +31335,13 @@
export LDFLAGS;
fi
@@ -79042,12 +81468,12 @@
samba_cv_sysquotas_file="lib/sysquotas_3.c"
fi
-@@ -72804,410 +29723,12 @@
+@@ -75884,151 +31349,12 @@
#################################################
# check for mntent.h and struct mntent
-
--for ac_header in mntent.h
+ 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
@@ -79189,20 +81615,23 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
++if test "x$ac_cv_header_mntent_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define HAVE_MNTENT_H 1
+ _ACEOF
+
+ fi
+@@ -76037,102 +31363,12 @@
+
+ #################################################
+ # check for setmntent,getmntent,endmntent
-
--fi
-
--done
-
--#################################################
--# check for setmntent,getmntent,endmntent
--
--
--
--for ac_func in setmntent getmntent endmntent
+ for ac_func in setmntent getmntent endmntent
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -79295,18 +81724,20 @@
-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
++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
+@@ -76143,151 +31379,12 @@
+
+ #################################################
+ # check for devnm.h and struct mntent
-
--fi
--done
--
--
--#################################################
--# check for devnm.h and struct mntent
--
--for ac_header in devnm.h
+ for ac_header in devnm.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -79448,23 +81879,21 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_header in mntent.h
+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 :
++ 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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_MNTENT_H 1
++#define HAVE_DEVNM_H 1
_ACEOF
fi
-@@ -73215,103 +29736,43 @@
- done
+@@ -76296,102 +31393,12 @@
#################################################
--# check for devnm
+ # check for devnm
-
--for ac_func in devnm
+ for ac_func in devnm
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -79474,16 +81903,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# 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
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -79501,11 +81921,9 @@
-#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. */
@@ -79519,7 +81937,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
+-
-int
-main ()
-{
@@ -79527,15 +81945,7 @@
- ;
- return 0;
-}
-+#################################################
-+# 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
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -79561,10 +81971,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -79576,11 +81986,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+#################################################
-+# check for devnm
-+for ac_func in devnm
+do :
+ ac_fn_c_check_func "$LINENO" "devnm" "ac_cv_func_devnm"
+if test "x$ac_cv_func_devnm" = x""yes; then :
@@ -79590,7 +81995,7 @@
_ACEOF
fi
-@@ -73334,19 +29795,15 @@
+@@ -76414,19 +31421,15 @@
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -79613,7 +82018,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73364,76 +29821,47 @@
+@@ -76444,76 +31447,47 @@
return 0;
}
_ACEOF
@@ -79701,7 +82106,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73451,62 +29879,35 @@
+@@ -76531,62 +31505,35 @@
return 0;
}
_ACEOF
@@ -79771,7 +82176,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73522,56 +29923,33 @@
+@@ -76602,56 +31549,33 @@
return 0;
}
_ACEOF
@@ -79836,7 +82241,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -73583,12 +29961,12 @@
+@@ -76663,12 +31587,12 @@
#################################################
# check for experimental utmp accounting
@@ -79851,7 +82256,7 @@
withval=$with_utmp; case "$withval" in
no)
WITH_UTMP=no
-@@ -73611,15 +29989,13 @@
+@@ -76691,41 +31615,35 @@
# Display test results
if test x"$WITH_UTMP" = x"yes"; then
@@ -79870,328 +82275,7 @@
$as_echo "no$utmp_no_reason" >&6; }
fi
-@@ -73645,10 +30021,10 @@
- USESHARED=false
-
--{ $as_echo "$as_me:$LINENO: checking whether to use shared libraries internally" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use shared libraries internally" >&5
- $as_echo_n "checking whether to use shared libraries internally... " >&6; }
- # Check whether --enable-shared-libs was given.
--if test "${enable_shared_libs+set}" = set; then
-+if test "${enable_shared_libs+set}" = set; then :
- enableval=$enable_shared_libs; enable_shared_libs=$enableval
- else
- enable_shared_libs=yes
-@@ -73659,11 +30035,11 @@
- USESHARED=$BLDSHARED
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $USESHARED" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USESHARED" >&5
- $as_echo "$USESHARED" >&6; }
-
- if test x"$enable_shared_libs" = x"yes" -a x"$BLDSHARED" != x"true" ; then
-- { $as_echo "$as_me:$LINENO: WARNING: --enable-shared-libs: no support for shared libraries" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-shared-libs: no support for shared libraries" >&5
- $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
- fi
-
-@@ -73691,14 +30067,13 @@
-
-
- # Check whether --with-static-libs was given.
--if test "${with_static_libs+set}" = set; then
-- withval=$with_static_libs; if test $withval; then
-+if test "${with_static_libs+set}" = set; then :
-+ withval=$with_static_libs; if test $withval; then :
- for lib in `echo $withval | sed -e 's/,/ /g'` ; do
- lib=`echo $lib | tr '[a-z]' '[A-Z]'`
- eval LINK_$lib=STATIC
- done
- fi
--
- fi
-
-
-@@ -73747,16 +30122,16 @@
-
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtalloc shared library" >&5
- $as_echo_n "checking whether to build the libtalloc shared library... " >&6; }
-
-
- # Check whether --with-libtalloc was given.
--if test "${with_libtalloc+set}" = set; then
-+if test "${with_libtalloc+set}" = set; then :
- withval=$with_libtalloc;
- case "$withval" in
- no)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- build_lib=no
- ;;
-@@ -73782,7 +30157,7 @@
- if eval $BLDSHARED = true; then
- LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
- LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
- enable_static=yes
-@@ -73795,12 +30170,12 @@
- enable_static=yes
- LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
- LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
-- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- fi
- else
- enable_static=yes
-- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -73851,16 +30226,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; }
-
-
- # Check whether --with-libtdb was given.
--if test "${with_libtdb+set}" = set; then
-+if test "${with_libtdb+set}" = set; then :
- withval=$with_libtdb;
- case "$withval" in
- no)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- build_lib=no
- ;;
-@@ -73886,7 +30261,7 @@
- if eval $BLDSHARED = true; then
- LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
- LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
- enable_static=yes
-@@ -73899,12 +30274,12 @@
- enable_static=yes
- LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
- LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
-- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- fi
- else
- enable_static=yes
-- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -73942,16 +30317,16 @@
-
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libnetapi shared library" >&5
- $as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
-
-
- # Check whether --with-libnetapi was given.
--if test "${with_libnetapi+set}" = set; then
-+if test "${with_libnetapi+set}" = set; then :
- withval=$with_libnetapi;
- case "$withval" in
- no)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- build_lib=no
- ;;
-@@ -73977,7 +30352,7 @@
- if eval $BLDSHARED = true; then
- LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
- LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
- enable_static=yes
-@@ -73990,12 +30365,12 @@
- enable_static=yes
- LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
- LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
-- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- fi
- else
- enable_static=yes
-- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74033,16 +30408,16 @@
-
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbclient shared library" >&5
- $as_echo_n "checking whether to build the libsmbclient shared library... " >&6; }
-
-
- # Check whether --with-libsmbclient was given.
--if test "${with_libsmbclient+set}" = set; then
-+if test "${with_libsmbclient+set}" = set; then :
- withval=$with_libsmbclient;
- case "$withval" in
- no)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- build_lib=no
- ;;
-@@ -74068,7 +30443,7 @@
- if eval $BLDSHARED = true; then
- LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
- LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
- enable_static=yes
-@@ -74081,12 +30456,12 @@
- enable_static=yes
- LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
- LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
-- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- fi
- else
- enable_static=yes
-- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74124,16 +30499,16 @@
-
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbsharemodes shared library" >&5
- $as_echo_n "checking whether to build the libsmbsharemodes shared library... " >&6; }
-
-
- # Check whether --with-libsmbsharemodes was given.
--if test "${with_libsmbsharemodes+set}" = set; then
-+if test "${with_libsmbsharemodes+set}" = set; then :
- withval=$with_libsmbsharemodes;
- case "$withval" in
- no)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- build_lib=no
- ;;
-@@ -74159,7 +30534,7 @@
- if eval $BLDSHARED = true; then
- LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
- LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
- enable_static=yes
-@@ -74172,12 +30547,12 @@
- enable_static=yes
- LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
- LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
-- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- fi
- else
- enable_static=yes
-- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74215,19 +30590,19 @@
-
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libaddns shared library" >&5
- $as_echo_n "checking whether to build the libaddns shared library... " >&6; }
-
-
- # Check whether --with-libaddns was given.
--if test "${with_libaddns+set}" = set; then
-+if test "${with_libaddns+set}" = set; then :
- withval=$with_libaddns;
- case "$withval" in
- yes)
- build_lib=yes
- ;;
- *)
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- build_lib=no
- ;;
-@@ -74236,7 +30611,7 @@
- else
-
- # if unspecified, default is not to build
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- build_lib=no
-
-@@ -74252,7 +30627,7 @@
- if eval $BLDSHARED = true; then
- LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
- LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
- enable_static=yes
-@@ -74265,12 +30640,12 @@
- enable_static=yes
- LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
- LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
-- { $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- fi
- else
- enable_static=yes
-- { $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74286,26 +30661,22 @@
-
#################################################
# these tests are taken from the GNU fileutils package
-{ $as_echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
@@ -80222,7 +82306,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -74319,51 +30690,22 @@
+@@ -76739,51 +31657,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -80280,7 +82364,7 @@
fi
fi
-@@ -74376,16 +30718,12 @@
+@@ -76796,16 +31685,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -80300,7 +82384,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74397,47 +30735,20 @@
+@@ -76817,47 +31702,20 @@
return 0;
}
_ACEOF
@@ -80354,7 +82438,7 @@
fi
fi
-@@ -74445,17 +30756,13 @@
+@@ -76865,17 +31723,13 @@
# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
# This is not the case on ancient Linux systems.
@@ -80375,7 +82459,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74467,57 +30774,30 @@
+@@ -76887,57 +31741,30 @@
return 0;
}
_ACEOF
@@ -80440,7 +82524,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74529,56 +30809,29 @@
+@@ -76949,56 +31776,29 @@
return 0;
}
_ACEOF
@@ -80504,7 +82588,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74590,55 +30843,28 @@
+@@ -77010,55 +31810,28 @@
return 0;
}
_ACEOF
@@ -80567,7 +82651,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74650,59 +30876,32 @@
+@@ -77070,59 +31843,32 @@
return 0;
}
_ACEOF
@@ -80635,7 +82719,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -74715,71 +30914,38 @@
+@@ -77135,71 +31881,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -80717,7 +82801,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -74798,71 +30964,38 @@
+@@ -77218,71 +31931,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -80799,7 +82883,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -74872,71 +31005,38 @@
+@@ -77292,71 +31972,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -80881,7 +82965,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -74952,71 +31052,38 @@
+@@ -77372,71 +32019,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -80963,7 +83047,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -75036,52 +31103,23 @@
+@@ -77456,52 +32070,23 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -81022,7 +83106,7 @@
fi
fi
-@@ -75094,13 +31132,9 @@
+@@ -77514,13 +32099,9 @@
# If we don't have all of these then disable large
# file support.
#
@@ -81038,7 +83122,7 @@
/* end confdefs.h. */
#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -75117,41 +31151,18 @@
+@@ -77537,41 +32118,18 @@
return 0;
}
_ACEOF
@@ -81084,7 +83168,7 @@
$as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
#################################################
-@@ -75161,10 +31172,10 @@
+@@ -77581,10 +32139,10 @@
# Check whether --with-ctdb was given.
@@ -81097,8 +83181,8 @@
$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
;;
*)
-@@ -75178,340 +31189,40 @@
- CPPFLAGS="$CPPFLAGS $CTDB_CPPFLAGS"
+@@ -77598,71 +32156,23 @@
+ CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
ctdb_broken="missing or broken headers"
-
@@ -81179,16 +83263,81 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+@@ -77673,17 +32183,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; }
+-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
+
+- 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"
+@@ -77704,41 +32210,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_have_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
-
--done
--
--
--
-- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
--$as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
--if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then
+ 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
+
+-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
+
+@@ -77749,351 +32232,13 @@
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_ACTIVE declaration" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS2_ACTIVE declaration" >&5
+ $as_echo_n "checking for CTDB_CONTROL_TRANS2_ACTIVE declaration... " >&6; }
+-if test "${ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
@@ -81212,7 +83361,7 @@
-int
-main ()
-{
--int i = (int)CTDB_CONTROL_TRANS2_COMMIT_RETRY
+-int i = (int)CTDB_CONTROL_TRANS2_ACTIVE
- ;
- return 0;
-}
@@ -81235,30 +83384,30 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
+- ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_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_ACTIVE_decl=no
-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 "$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 "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&5
+-$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&6; }
+- if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
-
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1
+-#define HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL 1
-_ACEOF
-
- fi
-
--if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
+-if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
- ctdb_broken=no
-else
-- ctdb_broken="missing transaction support"
+- ctdb_broken="transaction support too old"
-fi
-
-# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
@@ -81445,36 +83594,28 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+done
-+
-+
-+
-+ { $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
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- #include "confdefs.h"
-@@ -75524,202 +31235,109 @@
- #include <ctdb.h>
- #include <ctdb_private.h>
-
+-/* end confdefs.h. */
-
- int
- main ()
- {
+-#include "confdefs.h"
+-#define NO_CONFIG_H
+-#include "replace.h"
+-#include "system/wait.h"
+-#include "system/network.h"
+-#include <talloc.h>
+-#include <tdb.h>
+-#include <ctdb.h>
+-#include <ctdb_private.h>
+-
+-
+-int
+-main ()
+-{
-if (sizeof ((struct ctdb_control_tcp)))
- return 0;
-+int i = (int)CTDB_CONTROL_TRANS2_COMMIT_RETRY
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -81502,84 +83643,64 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
- else
+-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
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_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"
-
-+ ctdb_broken="missing transaction support"
- fi
-
+-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
-- $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_struct_ctdb_control_tcp_addr=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--#include "confdefs.h"
-+# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
-+ac_fn_c_check_type "$LINENO" "struct ctdb_tcp_client" "ac_cv_type_struct_ctdb_tcp_client" "
-+#include \"confdefs.h\"
- #define NO_CONFIG_H
--#include "replace.h"
--#include "system/wait.h"
--#include "system/network.h"
-+#include \"replace.h\"
-+#include \"system/wait.h\"
-+#include \"system/network.h\"
- #include <talloc.h>
- #include <tdb.h>
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #include "confdefs.h"
+@@ -78106,116 +32251,109 @@
#include <ctdb.h>
#include <ctdb_private.h>
-+"
-+if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
-
--int
--main ()
--{
+-
+ int
+ main ()
+ {
-if (sizeof (struct ctdb_control_tcp_addr))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++int i = (int)CTDB_CONTROL_TRANS2_ACTIVE
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -81604,15 +83725,30 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=yes
++else
++ ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_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_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&5
++$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&6; }
++ if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
-#include "confdefs.h"
-+$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
++$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL 1" >>confdefs.h
+
++ fi
+
++if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
++ ctdb_broken=no
++else
++ ctdb_broken="transaction support too old"
+fi
+
-+
-+ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp" "ac_cv_type_struct_ctdb_control_tcp" "
++# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
++ac_fn_c_check_type "$LINENO" "struct ctdb_tcp_client" "ac_cv_type_struct_ctdb_tcp_client" "
+#include \"confdefs.h\"
#define NO_CONFIG_H
-#include "replace.h"
@@ -81627,7 +83763,10 @@
#include <ctdb_private.h>
+"
-+if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
++if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
++
++
++$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
-int
-main ()
@@ -81662,11 +83801,28 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_struct_ctdb_control_tcp_addr=yes
--fi
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp" "ac_cv_type_struct_ctdb_control_tcp" "
++#include \"confdefs.h\"
++#define NO_CONFIG_H
++#include \"replace.h\"
++#include \"system/wait.h\"
++#include \"system/network.h\"
++#include <talloc.h>
++#include <tdb.h>
++#include <ctdb.h>
++#include <ctdb_private.h>
++
++"
++if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
++
++
+$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
+
-
--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
@@ -81680,7 +83836,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
@@ -81691,14 +83847,14 @@
+#include <tdb.h>
+#include <ctdb.h>
+#include <ctdb_private.h>
-+
-+"
-+if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then :
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1
-_ACEOF
++"
++if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then :
++
++
+$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1" >>confdefs.h
@@ -81716,7 +83872,7 @@
withval=$with_cluster_support;
fi
-@@ -75730,44 +31348,38 @@
+@@ -78226,44 +32364,38 @@
if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
if test "x$with_cluster_support" = "xyes"; then
@@ -81768,7 +83924,7 @@
withval=$with_acl_support; case "$withval" in
yes|no)
with_acl_support="$withval"
-@@ -75780,105 +31392,85 @@
+@@ -78276,105 +32408,85 @@
with_acl_support="auto"
fi
@@ -81895,7 +84051,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -75896,60 +31488,31 @@
+@@ -78392,60 +32504,31 @@
return 0;
}
_ACEOF
@@ -81965,7 +84121,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -75967,61 +31530,32 @@
+@@ -78463,61 +32546,32 @@
return 0;
}
_ACEOF
@@ -82036,7 +84192,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76040,64 +31574,33 @@
+@@ -78536,64 +32590,33 @@
return 0;
}
_ACEOF
@@ -82111,7 +84267,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76115,58 +31618,29 @@
+@@ -78611,58 +32634,29 @@
return 0;
}
_ACEOF
@@ -82178,7 +84334,7 @@
fi
;;
-@@ -76178,31 +31652,27 @@
+@@ -78674,31 +32668,27 @@
#################################################
# check for AIO support
@@ -82216,7 +84372,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76220,58 +31690,29 @@
+@@ -78716,58 +32706,29 @@
return 0;
}
_ACEOF
@@ -82284,7 +84440,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76289,59 +31730,30 @@
+@@ -78785,59 +32746,30 @@
return 0;
}
_ACEOF
@@ -82353,7 +84509,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76353,55 +31765,26 @@
+@@ -78849,55 +32781,26 @@
return 0;
}
_ACEOF
@@ -82417,7 +84573,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76413,716 +31796,317 @@
+@@ -78909,716 +32812,317 @@
return 0;
}
_ACEOF
@@ -83272,7 +85428,7 @@
$as_echo "no" >&6; }
fi
-@@ -77139,30 +32123,26 @@
+@@ -79635,30 +33139,26 @@
# check for sendfile support
with_sendfile_support=yes
@@ -83309,7 +85465,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -77178,116 +32158,58 @@
+@@ -79674,53 +33174,24 @@
return 0;
}
_ACEOF
@@ -83371,18 +85527,10 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
- main ()
- {
- \
--int tofd, fromfd;
--off_t offset;
--size_t total;
--ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
--
-- ;
-- return 0;
--}
--_ACEOF
+@@ -79736,54 +33207,25 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -83404,15 +85552,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+int tofd, fromfd;
-+off_t offset;
-+size_t total;
-+ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
samba_cv_HAVE_SENDFILE=yes
else
@@ -83451,7 +85590,7 @@
/* end confdefs.h. */
\
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -77307,103 +32229,58 @@
+@@ -79803,103 +33245,58 @@
return 0;
}
_ACEOF
@@ -83572,10 +85711,15 @@
/* end confdefs.h. */
\
#include <sys/types.h>
-@@ -77430,76 +32307,41 @@
- return 0;
- }
- _ACEOF
+@@ -79921,81 +33318,46 @@
+ hdtrl.iov_base = NULL;
+ hdtrl.iov_len = 0;
+ ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -83597,6 +85741,11 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
samba_cv_HAVE_SENDFILE=yes
else
@@ -83661,7 +85810,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77523,73 +32365,38 @@
+@@ -80019,73 +33381,38 @@
return 0;
}
_ACEOF
@@ -83747,7 +85896,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77613,77 +32420,41 @@
+@@ -80109,77 +33436,41 @@
return 0;
}
_ACEOF
@@ -83837,7 +85986,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -77701,43 +32472,18 @@
+@@ -80197,43 +33488,18 @@
return 0;
}
_ACEOF
@@ -83887,7 +86036,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSENDFILE 1
_ACEOF
-@@ -77746,17 +32492,13 @@
+@@ -80242,17 +33508,13 @@
fi
@@ -83908,7 +86057,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -77787,74 +32529,39 @@
+@@ -80283,74 +33545,39 @@
return 0;
}
_ACEOF
@@ -83995,7 +86144,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -77885,75 +32592,40 @@
+@@ -80381,75 +33608,40 @@
return 0;
}
_ACEOF
@@ -84083,7 +86232,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77981,59 +32653,28 @@
+@@ -80477,59 +33669,28 @@
return 0;
}
_ACEOF
@@ -84152,7 +86301,7 @@
$as_echo "no" >&6; };
fi
;;
-@@ -78042,12 +32683,12 @@
+@@ -80538,12 +33699,12 @@
esac
;;
*)
@@ -84167,7 +86316,7 @@
$as_echo "yes" >&6; }
fi
-@@ -78056,17 +32697,13 @@
+@@ -80552,17 +33713,13 @@
############################################
# See if we have the Linux readahead syscall.
@@ -84188,7 +86337,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78081,62 +32718,31 @@
+@@ -80577,62 +33734,31 @@
return 0;
}
_ACEOF
@@ -84260,7 +86409,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78147,41 +32753,18 @@
+@@ -80643,41 +33769,18 @@
return 0;
}
_ACEOF
@@ -84306,7 +86455,7 @@
fi
-@@ -78189,17 +32772,13 @@
+@@ -80685,17 +33788,13 @@
############################################
# See if we have the posix_fadvise syscall.
@@ -84327,7 +86476,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78214,47 +32793,20 @@
+@@ -80710,47 +33809,20 @@
return 0;
}
_ACEOF
@@ -84381,7 +86530,7 @@
fi
-@@ -78263,17 +32815,13 @@
+@@ -80759,17 +33831,13 @@
case "$host_os" in
*linux*)
@@ -84402,7 +86551,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78288,40 +32836,15 @@
+@@ -80784,40 +33852,15 @@
return 0;
}
_ACEOF
@@ -84448,7 +86597,7 @@
$as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
;;
*)
-@@ -78331,24 +32854,18 @@
+@@ -80827,24 +33870,18 @@
if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
@@ -84477,7 +86626,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78359,41 +32876,18 @@
+@@ -80855,41 +33892,18 @@
return 0;
}
_ACEOF
@@ -84523,7 +86672,7 @@
fi
-@@ -78401,68 +32895,35 @@
+@@ -80897,68 +33911,35 @@
############################################
# See if we have the a broken readlink syscall.
@@ -84602,7 +86751,7 @@
fi
-@@ -78470,7 +32931,7 @@
+@@ -80966,7 +33947,7 @@
# Check whether winbind is supported on this platform. If so we need to
# build and install client programs, sbin programs and shared libraries
@@ -84611,7 +86760,7 @@
$as_echo_n "checking whether to build winbind... " >&6; }
# Initially, the value of $host_os decides whether winbind is supported
-@@ -78482,7 +32943,7 @@
+@@ -80978,7 +33959,7 @@
# We define this here so --with-winbind can override it.
# Check whether --with-wbclient was given.
@@ -84620,7 +86769,7 @@
withval=$with_wbclient;
case "$withval" in
no)
-@@ -78583,7 +33044,7 @@
+@@ -81077,7 +34058,7 @@
# Check whether --with-winbind was given.
@@ -84629,7 +86778,7 @@
withval=$with_winbind;
case "$withval" in
yes)
-@@ -78614,18 +33075,14 @@
+@@ -81108,18 +34089,14 @@
WINBIND_WINS_NSS=""
fi
if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -84651,7 +86800,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78643,57 +33100,28 @@
+@@ -81137,57 +34114,28 @@
return 0;
}
_ACEOF
@@ -84718,7 +86867,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
else
-@@ -78724,12 +33152,10 @@
+@@ -81216,12 +34164,10 @@
fi
if test x"$HAVE_WINBIND" = x"yes"; then
@@ -84733,7 +86882,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -78740,22 +33166,18 @@
+@@ -81232,22 +34178,18 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
else
@@ -84760,7 +86909,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78773,48 +33195,21 @@
+@@ -81265,48 +34207,21 @@
return 0;
}
_ACEOF
@@ -84814,11 +86963,11 @@
-_ACEOF
+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
- fi
+ samba_cv_HAVE_PTHREAD=yes
+ else
+@@ -81324,108 +34239,11 @@
-@@ -78831,533 +33226,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; }
@@ -84918,17 +87067,21 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&5
-$as_echo "$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&6; }
-if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then
--
++ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
++"
++if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NSS_XBYY_KEY_IPNODE 1
-_ACEOF
--
--fi
--
--
--# Solaris has some extra fields in struct passwd that need to be
--# initialised otherwise nscd crashes.
--
++$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
+
+ fi
+
+@@ -81433,318 +34251,29 @@
+ # Solaris has some extra fields in struct passwd that need to be
+ # initialised otherwise nscd crashes.
+
-{ $as_echo "$as_me:$LINENO: checking for struct passwd.pw_comment" >&5
-$as_echo_n "checking for struct passwd.pw_comment... " >&6; }
-if test "${ac_cv_member_struct_passwd_pw_comment+set}" = set; then
@@ -85088,7 +87241,10 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pwd.h>
--
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
+
-int
-main ()
-{
@@ -85121,28 +87277,33 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
+
- ac_cv_member_struct_passwd_pw_age=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_member_struct_passwd_pw_age" >&5
-$as_echo "$ac_cv_member_struct_passwd_pw_age" >&6; }
-if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then
--
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PASSWD_PW_AGE 1
-_ACEOF
--
--fi
--
--
--# AIX 4.3.x and 5.1 do not have as many members in
--# struct secmethod_table as AIX 5.2
++$as_echo "#define HAVE_PASSWD_PW_AGE 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
-$as_echo_n "checking for struct secmethod_table.method_attrlist... " >&6; }
-if test "${ac_cv_member_struct_secmethod_table_method_attrlist+set}" = set; then
@@ -85229,34 +87390,25 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+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 :
-
+-
- ac_cv_member_struct_secmethod_table_method_attrlist=no
-fi
-+$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_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
-+# 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>
++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_passwd_pw_comment" = x""yes; then :
++if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
-+$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
+@@ -81753,104 +34282,9 @@
fi
@@ -85272,7 +87424,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <usersec.h>
-
+-
-int
-main ()
-{
@@ -85305,10 +87457,7 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+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 :
-
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -85316,8 +87465,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <usersec.h>
-+$as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
-
+-
-int
-main ()
-{
@@ -85327,18 +87475,7 @@
- ;
- return 0;
-}
-+fi
-+
-+
-+# AIX 4.3.x and 5.1 do not have as many members in
-+# struct secmethod_table as AIX 5.2
-+ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
-+"
-+if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -85361,13 +87498,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_member_struct_secmethod_table_method_version=no
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_version" >&5
@@ -85379,7 +87516,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -79367,17 +33281,13 @@
+@@ -81860,17 +34294,13 @@
fi
@@ -85400,7 +87537,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
-@@ -79392,41 +33302,18 @@
+@@ -81885,41 +34315,18 @@
return 0;
}
_ACEOF
@@ -85446,7 +87583,7 @@
fi
-@@ -79436,7 +33323,7 @@
+@@ -81929,7 +34336,7 @@
# Check whether --with-included-popt was given.
@@ -85455,7 +87592,7 @@
withval=$with_included_popt;
case "$withval" in
yes)
-@@ -79449,18 +33336,14 @@
+@@ -81942,18 +34349,14 @@
fi
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -85477,7 +87614,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79478,43 +33361,18 @@
+@@ -81971,43 +34374,18 @@
return 0;
}
_ACEOF
@@ -85527,7 +87664,7 @@
INCLUDED_POPT=no
else
INCLUDED_POPT=yes
-@@ -79522,16 +33380,16 @@
+@@ -82015,16 +34393,16 @@
fi
@@ -85547,7 +87684,7 @@
$as_echo "no" >&6; }
BUILD_POPT=""
POPTLIBS="-lpopt"
-@@ -79544,7 +33402,7 @@
+@@ -82037,7 +34415,7 @@
# Check if user wants DNS service discovery support
# Check whether --enable-dnssd was given.
@@ -85556,7 +87693,7 @@
enableval=$enable_dnssd;
fi
-@@ -79553,151 +33411,12 @@
+@@ -82046,151 +34424,12 @@
if test x"$enable_dnssd" = x"yes"; then
have_dnssd_support=yes
@@ -85713,7 +87850,7 @@
_ACEOF
fi
-@@ -79710,102 +33429,12 @@
+@@ -82203,102 +34442,12 @@
# On Darwin the DNSSD API is in libc, but on other platforms it's
# probably in -ldns_sd
@@ -85821,7 +87958,7 @@
_ACEOF
fi
-@@ -79813,23 +33442,17 @@
+@@ -82306,23 +34455,17 @@
@@ -85848,7 +87985,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79847,54 +33470,28 @@
+@@ -82340,54 +34483,28 @@
return 0;
}
_ACEOF
@@ -85910,7 +88047,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNS_SD 1
_ACEOF
-@@ -79909,7 +33506,6 @@
+@@ -82402,7 +34519,6 @@
fi
@@ -85918,7 +88055,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
-@@ -79917,15 +33513,11 @@
+@@ -82410,15 +34526,11 @@
if test x"$have_dnssd_support" = x"yes"; then
@@ -85936,7 +88073,7 @@
fi
fi
-@@ -79935,7 +33527,7 @@
+@@ -82428,7 +34540,7 @@
# Check if user wants avahi support
# Check whether --enable-avahi was given.
@@ -85945,7 +88082,7 @@
enableval=$enable_avahi;
fi
-@@ -79943,151 +33535,12 @@
+@@ -82436,151 +34548,12 @@
if test x"$enable_avahi" != x"no"; then
have_avahi_support=yes
@@ -86102,7 +88239,7 @@
_ACEOF
fi
-@@ -80098,151 +33551,12 @@
+@@ -82591,151 +34564,12 @@
have_avahi_support=no
fi
@@ -86259,7 +88396,7 @@
_ACEOF
fi
-@@ -80254,18 +33568,14 @@
+@@ -82747,18 +34581,14 @@
fi
save_LIBS="$LIBS"
@@ -86281,7 +88418,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80283,58 +33593,29 @@
+@@ -82776,58 +34606,29 @@
return 0;
}
_ACEOF
@@ -86349,7 +88486,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80352,43 +33633,18 @@
+@@ -82845,43 +34646,18 @@
return 0;
}
_ACEOF
@@ -86399,7 +88536,7 @@
have_avahi_strerror=yes
fi
-@@ -80403,17 +33659,13 @@
+@@ -82896,17 +34672,13 @@
AVAHI_LIBS="-lavahi-client -lavahi-common"
@@ -86419,16 +88556,85 @@
fi
fi
fi
-@@ -80423,7 +33675,7 @@
+@@ -82915,17 +34687,13 @@
+ # Check if user wants pthreadpool support
+ # Check whether --enable-pthreadpool was given.
+-if test "${enable_pthreadpool+set}" = set; then
++if test "${enable_pthreadpool+set}" = set; then :
+ enableval=$enable_pthreadpool;
+ fi
+
+ if test x"$enable_pthreadpool" != x"no" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include "pthread.h"
+ int
+@@ -82936,42 +34704,15 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_link "$LINENO"; then :
+
+- LIBS="$LIBS -lpthread"
++else
++ LIBS="$LIBS -lpthread"
+ 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
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_PTHREADPOOL 1
+-_ACEOF
++$as_echo "#define WITH_PTHREADPOOL 1" >>confdefs.h
+
+ PTHREADPOOL_OBJ="lib/pthreadpool.o"
+
+@@ -82982,7 +34723,7 @@
+
+
# Check whether --with-included-iniparser was given.
-if test "${with_included_iniparser+set}" = set; then
+if test "${with_included_iniparser+set}" = set; then :
withval=$with_included_iniparser;
case "$withval" in
yes)
-@@ -80436,18 +33688,14 @@
+@@ -82995,18 +34736,14 @@
fi
if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -86450,7 +88656,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80465,43 +33713,18 @@
+@@ -83024,43 +34761,18 @@
return 0;
}
_ACEOF
@@ -86500,7 +88706,7 @@
INCLUDED_INIPARSER=no
else
INCLUDED_INIPARSER=yes
-@@ -80509,260 +33732,40 @@
+@@ -83068,260 +34780,40 @@
fi
@@ -86511,8 +88717,8 @@
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- BUILD_INIPARSER='$(INIPARSER_OBJ)'
- INIPARSERLIBS=""
+- BUILD_INIPARSER='$(INIPARSER_OBJ)'
+- INIPARSERLIBS=""
- FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
@@ -86661,22 +88867,17 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+ FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
- 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; }
-+ BUILD_INIPARSER=""
-+ INIPARSERLIBS="-liniparser"
- 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; }
@@ -86709,14 +88910,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
-fi
-
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -86751,14 +88952,26 @@
-$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
++ BUILD_INIPARSER='$(INIPARSER_OBJ)'
++ INIPARSERLIBS=""
++ FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ BUILD_INIPARSER=""
++ INIPARSERLIBS="-liniparser"
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+
++
++
++
++
++
+# Checks for the vfs_fileid module
+# Start
+ac_fn_c_check_func "$LINENO" "getmntent" "ac_cv_func_getmntent"
@@ -86780,7 +88993,7 @@
_ACEOF
fi
-@@ -80770,20 +33773,16 @@
+@@ -83329,20 +34821,16 @@
done
@@ -86805,7 +89018,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -80795,46 +33794,19 @@
+@@ -83354,46 +34842,19 @@
return statfs (".", &fsd);
}
_ACEOF
@@ -86857,7 +89070,7 @@
$as_echo "$vfsfileid_cv_statfs" >&6; }
if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -80869,7 +33841,7 @@
+@@ -83428,7 +34889,7 @@
# Check whether --with-static-modules was given.
@@ -86866,7 +89079,7 @@
withval=$with_static_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -80881,7 +33853,7 @@
+@@ -83440,7 +34901,7 @@
# Check whether --with-shared-modules was given.
@@ -86875,16 +89088,16 @@
withval=$with_shared_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -80892,7 +33864,7 @@
+@@ -83457,7 +34918,7 @@
+ fi
-
- { $as_echo "$as_me:$LINENO: checking how to build pdb_ldap" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build pdb_ldap" >&5
$as_echo_n "checking how to build pdb_ldap... " >&6; }
if test "$MODULE_pdb_ldap"; then
DEST=$MODULE_pdb_ldap
-@@ -80904,12 +33876,10 @@
+@@ -83469,12 +34930,10 @@
if test x"$DEST" = xSHARED; then
@@ -86899,7 +89112,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -80920,16 +33890,16 @@
+@@ -83485,16 +34944,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -86914,12 +89127,47 @@
fi
+- { $as_echo "$as_me:$LINENO: checking how to build pdb_ads" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build pdb_ads" >&5
+ $as_echo_n "checking how to build pdb_ads... " >&6; }
+ if test "$MODULE_pdb_ads"; then
+ DEST=$MODULE_pdb_ads
+@@ -83506,12 +34965,10 @@
+
+ if test x"$DEST" = xSHARED; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define pdb_ads_init init_samba_module
+-_ACEOF
++$as_echo "#define pdb_ads_init init_samba_module" >>confdefs.h
+
+ PDB_MODULES="$PDB_MODULES "bin/ads.$SHLIBEXT""
+- { $as_echo "$as_me:$LINENO: result: shared" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+ $as_echo "shared" >&6; }
+
+ string_shared_modules="$string_shared_modules pdb_ads"
+@@ -83522,16 +34979,16 @@
+ PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
+
+
+- { $as_echo "$as_me:$LINENO: result: static" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
+ else
+ string_ignored_modules="$string_ignored_modules pdb_ads"
+- { $as_echo "$as_me:$LINENO: result: not" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not" >&5
+ $as_echo "not" >&6; }
+ fi
+
+
- { $as_echo "$as_me:$LINENO: checking how to build pdb_smbpasswd" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build pdb_smbpasswd" >&5
$as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
if test "$MODULE_pdb_smbpasswd"; then
DEST=$MODULE_pdb_smbpasswd
-@@ -80941,12 +33911,10 @@
+@@ -83543,12 +35000,10 @@
if test x"$DEST" = xSHARED; then
@@ -86934,7 +89182,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -80957,16 +33925,16 @@
+@@ -83559,16 +35014,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
@@ -86954,7 +89202,7 @@
$as_echo_n "checking how to build pdb_tdbsam... " >&6; }
if test "$MODULE_pdb_tdbsam"; then
DEST=$MODULE_pdb_tdbsam
-@@ -80978,12 +33946,10 @@
+@@ -83580,12 +35035,10 @@
if test x"$DEST" = xSHARED; then
@@ -86969,7 +89217,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -80994,16 +33960,16 @@
+@@ -83596,16 +35049,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
@@ -86989,7 +89237,7 @@
$as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
if test "$MODULE_pdb_wbc_sam"; then
DEST=$MODULE_pdb_wbc_sam
-@@ -81015,12 +33981,10 @@
+@@ -83617,12 +35070,10 @@
if test x"$DEST" = xSHARED; then
@@ -87004,7 +89252,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -81031,11 +33995,11 @@
+@@ -83633,11 +35084,11 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
@@ -87018,7 +89266,7 @@
$as_echo "not" >&6; }
fi
-@@ -81057,7 +34021,7 @@
+@@ -83659,7 +35110,7 @@
@@ -87027,7 +89275,7 @@
$as_echo_n "checking how to build rpc_lsarpc... " >&6; }
if test "$MODULE_rpc_lsarpc"; then
DEST=$MODULE_rpc_lsarpc
-@@ -81069,12 +34033,10 @@
+@@ -83671,12 +35122,10 @@
if test x"$DEST" = xSHARED; then
@@ -87042,7 +89290,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -81085,16 +34047,16 @@
+@@ -83687,16 +35136,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
@@ -87062,7 +89310,7 @@
$as_echo_n "checking how to build rpc_winreg... " >&6; }
if test "$MODULE_rpc_winreg"; then
DEST=$MODULE_rpc_winreg
-@@ -81106,12 +34068,10 @@
+@@ -83708,12 +35157,10 @@
if test x"$DEST" = xSHARED; then
@@ -87077,7 +89325,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -81122,16 +34082,16 @@
+@@ -83724,16 +35171,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
@@ -87097,7 +89345,7 @@
$as_echo_n "checking how to build rpc_initshutdown... " >&6; }
if test "$MODULE_rpc_initshutdown"; then
DEST=$MODULE_rpc_initshutdown
-@@ -81143,12 +34103,10 @@
+@@ -83745,12 +35192,10 @@
if test x"$DEST" = xSHARED; then
@@ -87112,7 +89360,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -81159,16 +34117,16 @@
+@@ -83761,16 +35206,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
@@ -87132,7 +89380,7 @@
$as_echo_n "checking how to build rpc_dssetup... " >&6; }
if test "$MODULE_rpc_dssetup"; then
DEST=$MODULE_rpc_dssetup
-@@ -81180,12 +34138,10 @@
+@@ -83782,12 +35227,10 @@
if test x"$DEST" = xSHARED; then
@@ -87147,7 +89395,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -81196,16 +34152,16 @@
+@@ -83798,16 +35241,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
@@ -87167,7 +89415,7 @@
$as_echo_n "checking how to build rpc_wkssvc... " >&6; }
if test "$MODULE_rpc_wkssvc"; then
DEST=$MODULE_rpc_wkssvc
-@@ -81217,12 +34173,10 @@
+@@ -83819,12 +35262,10 @@
if test x"$DEST" = xSHARED; then
@@ -87182,7 +89430,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -81233,16 +34187,16 @@
+@@ -83835,16 +35276,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
@@ -87202,7 +89450,7 @@
$as_echo_n "checking how to build rpc_svcctl... " >&6; }
if test "$MODULE_rpc_svcctl"; then
DEST=$MODULE_rpc_svcctl
-@@ -81254,12 +34208,10 @@
+@@ -83856,12 +35297,10 @@
if test x"$DEST" = xSHARED; then
@@ -87217,7 +89465,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -81270,16 +34222,16 @@
+@@ -83872,16 +35311,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
@@ -87237,7 +89485,7 @@
$as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
if test "$MODULE_rpc_ntsvcs"; then
DEST=$MODULE_rpc_ntsvcs
-@@ -81291,12 +34243,10 @@
+@@ -83893,12 +35332,10 @@
if test x"$DEST" = xSHARED; then
@@ -87252,7 +89500,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -81307,16 +34257,16 @@
+@@ -83909,16 +35346,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
@@ -87272,7 +89520,7 @@
$as_echo_n "checking how to build rpc_netlogon... " >&6; }
if test "$MODULE_rpc_netlogon"; then
DEST=$MODULE_rpc_netlogon
-@@ -81328,12 +34278,10 @@
+@@ -83930,12 +35367,10 @@
if test x"$DEST" = xSHARED; then
@@ -87287,7 +89535,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -81344,16 +34292,16 @@
+@@ -83946,16 +35381,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
@@ -87307,7 +89555,7 @@
$as_echo_n "checking how to build rpc_netdfs... " >&6; }
if test "$MODULE_rpc_netdfs"; then
DEST=$MODULE_rpc_netdfs
-@@ -81365,12 +34313,10 @@
+@@ -83967,12 +35402,10 @@
if test x"$DEST" = xSHARED; then
@@ -87322,7 +89570,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -81381,16 +34327,16 @@
+@@ -83983,16 +35416,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
@@ -87342,7 +89590,7 @@
$as_echo_n "checking how to build rpc_srvsvc... " >&6; }
if test "$MODULE_rpc_srvsvc"; then
DEST=$MODULE_rpc_srvsvc
-@@ -81402,12 +34348,10 @@
+@@ -84004,12 +35437,10 @@
if test x"$DEST" = xSHARED; then
@@ -87357,7 +89605,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -81418,16 +34362,16 @@
+@@ -84020,16 +35451,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
@@ -87377,7 +89625,7 @@
$as_echo_n "checking how to build rpc_spoolss... " >&6; }
if test "$MODULE_rpc_spoolss"; then
DEST=$MODULE_rpc_spoolss
-@@ -81439,12 +34383,10 @@
+@@ -84041,12 +35472,10 @@
if test x"$DEST" = xSHARED; then
@@ -87392,7 +89640,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -81455,16 +34397,16 @@
+@@ -84057,16 +35486,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
@@ -87412,7 +89660,7 @@
$as_echo_n "checking how to build rpc_eventlog... " >&6; }
if test "$MODULE_rpc_eventlog"; then
DEST=$MODULE_rpc_eventlog
-@@ -81476,12 +34418,10 @@
+@@ -84078,12 +35507,10 @@
if test x"$DEST" = xSHARED; then
@@ -87427,7 +89675,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -81492,16 +34432,16 @@
+@@ -84094,16 +35521,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
@@ -87447,7 +89695,7 @@
$as_echo_n "checking how to build rpc_samr... " >&6; }
if test "$MODULE_rpc_samr"; then
DEST=$MODULE_rpc_samr
-@@ -81513,12 +34453,10 @@
+@@ -84115,12 +35542,10 @@
if test x"$DEST" = xSHARED; then
@@ -87462,7 +89710,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_samr"
-@@ -81529,16 +34467,16 @@
+@@ -84131,16 +35556,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
@@ -87482,7 +89730,7 @@
$as_echo_n "checking how to build rpc_rpcecho... " >&6; }
if test "$MODULE_rpc_rpcecho"; then
DEST=$MODULE_rpc_rpcecho
-@@ -81550,12 +34488,10 @@
+@@ -84152,12 +35577,10 @@
if test x"$DEST" = xSHARED; then
@@ -87497,7 +89745,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -81566,11 +34502,11 @@
+@@ -84168,11 +35591,11 @@
RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
@@ -87511,7 +89759,7 @@
$as_echo "not" >&6; }
fi
-@@ -81591,7 +34527,7 @@
+@@ -84193,7 +35616,7 @@
@@ -87520,7 +89768,7 @@
$as_echo_n "checking how to build idmap_ldap... " >&6; }
if test "$MODULE_idmap_ldap"; then
DEST=$MODULE_idmap_ldap
-@@ -81603,12 +34539,10 @@
+@@ -84205,12 +35628,10 @@
if test x"$DEST" = xSHARED; then
@@ -87535,7 +89783,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -81619,16 +34553,16 @@
+@@ -84221,16 +35642,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
@@ -87555,7 +89803,7 @@
$as_echo_n "checking how to build idmap_tdb... " >&6; }
if test "$MODULE_idmap_tdb"; then
DEST=$MODULE_idmap_tdb
-@@ -81640,12 +34574,10 @@
+@@ -84242,12 +35663,10 @@
if test x"$DEST" = xSHARED; then
@@ -87570,7 +89818,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -81656,16 +34588,16 @@
+@@ -84258,16 +35677,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
@@ -87590,7 +89838,7 @@
$as_echo_n "checking how to build idmap_tdb2... " >&6; }
if test "$MODULE_idmap_tdb2"; then
DEST=$MODULE_idmap_tdb2
-@@ -81677,12 +34609,10 @@
+@@ -84279,12 +35698,10 @@
if test x"$DEST" = xSHARED; then
@@ -87605,7 +89853,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -81693,16 +34623,16 @@
+@@ -84295,16 +35712,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
@@ -87625,7 +89873,7 @@
$as_echo_n "checking how to build idmap_passdb... " >&6; }
if test "$MODULE_idmap_passdb"; then
DEST=$MODULE_idmap_passdb
-@@ -81714,12 +34644,10 @@
+@@ -84316,12 +35733,10 @@
if test x"$DEST" = xSHARED; then
@@ -87640,7 +89888,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -81730,16 +34658,16 @@
+@@ -84332,16 +35747,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
@@ -87660,7 +89908,7 @@
$as_echo_n "checking how to build idmap_nss... " >&6; }
if test "$MODULE_idmap_nss"; then
DEST=$MODULE_idmap_nss
-@@ -81751,12 +34679,10 @@
+@@ -84353,12 +35768,10 @@
if test x"$DEST" = xSHARED; then
@@ -87675,7 +89923,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_nss"
-@@ -81767,16 +34693,16 @@
+@@ -84369,16 +35782,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
@@ -87695,7 +89943,7 @@
$as_echo_n "checking how to build idmap_rid... " >&6; }
if test "$MODULE_idmap_rid"; then
DEST=$MODULE_idmap_rid
-@@ -81788,12 +34714,10 @@
+@@ -84390,12 +35803,10 @@
if test x"$DEST" = xSHARED; then
@@ -87710,7 +89958,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_rid"
-@@ -81804,16 +34728,16 @@
+@@ -84406,16 +35817,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
@@ -87730,7 +89978,7 @@
$as_echo_n "checking how to build idmap_ad... " >&6; }
if test "$MODULE_idmap_ad"; then
DEST=$MODULE_idmap_ad
-@@ -81825,12 +34749,10 @@
+@@ -84427,12 +35838,10 @@
if test x"$DEST" = xSHARED; then
@@ -87745,7 +89993,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ad"
-@@ -81841,16 +34763,16 @@
+@@ -84443,16 +35852,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
@@ -87765,7 +90013,7 @@
$as_echo_n "checking how to build idmap_hash... " >&6; }
if test "$MODULE_idmap_hash"; then
DEST=$MODULE_idmap_hash
-@@ -81862,12 +34784,10 @@
+@@ -84464,12 +35873,10 @@
if test x"$DEST" = xSHARED; then
@@ -87780,7 +90028,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_hash"
-@@ -81878,16 +34798,16 @@
+@@ -84480,16 +35887,16 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
@@ -87800,7 +90048,7 @@
$as_echo_n "checking how to build idmap_adex... " >&6; }
if test "$MODULE_idmap_adex"; then
DEST=$MODULE_idmap_adex
-@@ -81899,12 +34819,10 @@
+@@ -84501,12 +35908,10 @@
if test x"$DEST" = xSHARED; then
@@ -87815,7 +90063,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_adex"
-@@ -81915,11 +34833,11 @@
+@@ -84517,11 +35922,11 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
@@ -87829,7 +90077,7 @@
$as_echo "not" >&6; }
fi
-@@ -81940,7 +34858,7 @@
+@@ -84542,7 +35947,7 @@
@@ -87838,7 +90086,7 @@
$as_echo_n "checking how to build nss_info_template... " >&6; }
if test "$MODULE_nss_info_template"; then
DEST=$MODULE_nss_info_template
-@@ -81952,12 +34870,10 @@
+@@ -84554,12 +35959,10 @@
if test x"$DEST" = xSHARED; then
@@ -87853,7 +90101,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules nss_info_template"
-@@ -81968,11 +34884,11 @@
+@@ -84570,11 +35973,11 @@
NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
@@ -87867,7 +90115,7 @@
$as_echo "not" >&6; }
fi
-@@ -81993,7 +34909,7 @@
+@@ -84595,7 +35998,7 @@
@@ -87876,7 +90124,7 @@
$as_echo_n "checking how to build charset_weird... " >&6; }
if test "$MODULE_charset_weird"; then
DEST=$MODULE_charset_weird
-@@ -82005,12 +34921,10 @@
+@@ -84607,12 +36010,10 @@
if test x"$DEST" = xSHARED; then
@@ -87891,7 +90139,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_weird"
-@@ -82021,16 +34935,16 @@
+@@ -84623,16 +36024,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
@@ -87911,7 +90159,7 @@
$as_echo_n "checking how to build charset_CP850... " >&6; }
if test "$MODULE_charset_CP850"; then
DEST=$MODULE_charset_CP850
-@@ -82042,12 +34956,10 @@
+@@ -84644,12 +36045,10 @@
if test x"$DEST" = xSHARED; then
@@ -87926,7 +90174,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP850"
-@@ -82058,16 +34970,16 @@
+@@ -84660,16 +36059,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
@@ -87946,7 +90194,7 @@
$as_echo_n "checking how to build charset_CP437... " >&6; }
if test "$MODULE_charset_CP437"; then
DEST=$MODULE_charset_CP437
-@@ -82079,12 +34991,10 @@
+@@ -84681,12 +36080,10 @@
if test x"$DEST" = xSHARED; then
@@ -87961,7 +90209,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP437"
-@@ -82095,16 +35005,16 @@
+@@ -84697,16 +36094,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
@@ -87981,7 +90229,7 @@
$as_echo_n "checking how to build charset_macosxfs... " >&6; }
if test "$MODULE_charset_macosxfs"; then
DEST=$MODULE_charset_macosxfs
-@@ -82116,12 +35026,10 @@
+@@ -84718,12 +36115,10 @@
if test x"$DEST" = xSHARED; then
@@ -87996,7 +90244,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -82132,11 +35040,11 @@
+@@ -84734,11 +36129,11 @@
CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
@@ -88010,7 +90258,7 @@
$as_echo "not" >&6; }
fi
-@@ -82157,7 +35065,7 @@
+@@ -84759,7 +36154,7 @@
@@ -88019,7 +90267,7 @@
$as_echo_n "checking how to build auth_sam... " >&6; }
if test "$MODULE_auth_sam"; then
DEST=$MODULE_auth_sam
-@@ -82169,12 +35077,10 @@
+@@ -84771,12 +36166,10 @@
if test x"$DEST" = xSHARED; then
@@ -88034,7 +90282,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_sam"
-@@ -82185,16 +35091,16 @@
+@@ -84787,16 +36180,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
@@ -88054,7 +90302,7 @@
$as_echo_n "checking how to build auth_unix... " >&6; }
if test "$MODULE_auth_unix"; then
DEST=$MODULE_auth_unix
-@@ -82206,12 +35112,10 @@
+@@ -84808,12 +36201,10 @@
if test x"$DEST" = xSHARED; then
@@ -88069,7 +90317,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_unix"
-@@ -82222,16 +35126,16 @@
+@@ -84824,16 +36215,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
@@ -88089,7 +90337,7 @@
$as_echo_n "checking how to build auth_winbind... " >&6; }
if test "$MODULE_auth_winbind"; then
DEST=$MODULE_auth_winbind
-@@ -82243,12 +35147,10 @@
+@@ -84845,12 +36236,10 @@
if test x"$DEST" = xSHARED; then
@@ -88104,7 +90352,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_winbind"
-@@ -82259,16 +35161,16 @@
+@@ -84861,16 +36250,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
@@ -88124,7 +90372,7 @@
$as_echo_n "checking how to build auth_wbc... " >&6; }
if test "$MODULE_auth_wbc"; then
DEST=$MODULE_auth_wbc
-@@ -82280,12 +35182,10 @@
+@@ -84882,12 +36271,10 @@
if test x"$DEST" = xSHARED; then
@@ -88139,7 +90387,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_wbc"
-@@ -82296,16 +35196,16 @@
+@@ -84898,16 +36285,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
@@ -88159,7 +90407,7 @@
$as_echo_n "checking how to build auth_server... " >&6; }
if test "$MODULE_auth_server"; then
DEST=$MODULE_auth_server
-@@ -82317,12 +35217,10 @@
+@@ -84919,12 +36306,10 @@
if test x"$DEST" = xSHARED; then
@@ -88174,7 +90422,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_server"
-@@ -82333,16 +35231,16 @@
+@@ -84935,16 +36320,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
@@ -88194,7 +90442,7 @@
$as_echo_n "checking how to build auth_domain... " >&6; }
if test "$MODULE_auth_domain"; then
DEST=$MODULE_auth_domain
-@@ -82354,12 +35252,10 @@
+@@ -84956,12 +36341,10 @@
if test x"$DEST" = xSHARED; then
@@ -88209,7 +90457,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_domain"
-@@ -82370,16 +35266,16 @@
+@@ -84972,16 +36355,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
@@ -88229,7 +90477,7 @@
$as_echo_n "checking how to build auth_builtin... " >&6; }
if test "$MODULE_auth_builtin"; then
DEST=$MODULE_auth_builtin
-@@ -82391,12 +35287,10 @@
+@@ -84993,12 +36376,10 @@
if test x"$DEST" = xSHARED; then
@@ -88244,7 +90492,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_builtin"
-@@ -82407,16 +35301,16 @@
+@@ -85009,16 +36390,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
@@ -88264,7 +90512,7 @@
$as_echo_n "checking how to build auth_script... " >&6; }
if test "$MODULE_auth_script"; then
DEST=$MODULE_auth_script
-@@ -82428,12 +35322,10 @@
+@@ -85030,12 +36411,10 @@
if test x"$DEST" = xSHARED; then
@@ -88279,7 +90527,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_script"
-@@ -82444,16 +35336,16 @@
+@@ -85046,16 +36425,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
@@ -88299,7 +90547,7 @@
$as_echo_n "checking how to build auth_netlogond... " >&6; }
if test "$MODULE_auth_netlogond"; then
DEST=$MODULE_auth_netlogond
-@@ -82465,12 +35357,10 @@
+@@ -85067,12 +36446,10 @@
if test x"$DEST" = xSHARED; then
@@ -88314,7 +90562,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -82481,11 +35371,11 @@
+@@ -85083,11 +36460,11 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
@@ -88328,7 +90576,7 @@
$as_echo "not" >&6; }
fi
-@@ -82506,7 +35396,7 @@
+@@ -85108,7 +36485,7 @@
@@ -88337,7 +90585,7 @@
$as_echo_n "checking how to build vfs_default... " >&6; }
if test "$MODULE_vfs_default"; then
DEST=$MODULE_vfs_default
-@@ -82518,12 +35408,10 @@
+@@ -85120,12 +36497,10 @@
if test x"$DEST" = xSHARED; then
@@ -88352,7 +90600,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default"
-@@ -82534,16 +35422,16 @@
+@@ -85136,16 +36511,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
@@ -88372,7 +90620,7 @@
$as_echo_n "checking how to build vfs_recycle... " >&6; }
if test "$MODULE_vfs_recycle"; then
DEST=$MODULE_vfs_recycle
-@@ -82555,12 +35443,10 @@
+@@ -85157,12 +36532,10 @@
if test x"$DEST" = xSHARED; then
@@ -88387,7 +90635,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -82571,16 +35457,16 @@
+@@ -85173,16 +36546,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
@@ -88407,7 +90655,7 @@
$as_echo_n "checking how to build vfs_audit... " >&6; }
if test "$MODULE_vfs_audit"; then
DEST=$MODULE_vfs_audit
-@@ -82592,12 +35478,10 @@
+@@ -85194,12 +36567,10 @@
if test x"$DEST" = xSHARED; then
@@ -88422,7 +90670,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_audit"
-@@ -82608,16 +35492,16 @@
+@@ -85210,16 +36581,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
@@ -88442,7 +90690,7 @@
$as_echo_n "checking how to build vfs_extd_audit... " >&6; }
if test "$MODULE_vfs_extd_audit"; then
DEST=$MODULE_vfs_extd_audit
-@@ -82629,12 +35513,10 @@
+@@ -85231,12 +36602,10 @@
if test x"$DEST" = xSHARED; then
@@ -88457,7 +90705,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -82645,16 +35527,16 @@
+@@ -85247,16 +36616,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
@@ -88477,7 +90725,7 @@
$as_echo_n "checking how to build vfs_full_audit... " >&6; }
if test "$MODULE_vfs_full_audit"; then
DEST=$MODULE_vfs_full_audit
-@@ -82666,12 +35548,10 @@
+@@ -85268,12 +36637,10 @@
if test x"$DEST" = xSHARED; then
@@ -88492,7 +90740,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -82682,16 +35562,16 @@
+@@ -85284,16 +36651,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
@@ -88512,7 +90760,7 @@
$as_echo_n "checking how to build vfs_netatalk... " >&6; }
if test "$MODULE_vfs_netatalk"; then
DEST=$MODULE_vfs_netatalk
-@@ -82703,12 +35583,10 @@
+@@ -85305,12 +36672,10 @@
if test x"$DEST" = xSHARED; then
@@ -88527,7 +90775,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -82719,16 +35597,16 @@
+@@ -85321,16 +36686,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
@@ -88547,7 +90795,7 @@
$as_echo_n "checking how to build vfs_fake_perms... " >&6; }
if test "$MODULE_vfs_fake_perms"; then
DEST=$MODULE_vfs_fake_perms
-@@ -82740,12 +35618,10 @@
+@@ -85342,12 +36707,10 @@
if test x"$DEST" = xSHARED; then
@@ -88562,7 +90810,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -82756,16 +35632,16 @@
+@@ -85358,16 +36721,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
@@ -88582,7 +90830,7 @@
$as_echo_n "checking how to build vfs_default_quota... " >&6; }
if test "$MODULE_vfs_default_quota"; then
DEST=$MODULE_vfs_default_quota
-@@ -82777,12 +35653,10 @@
+@@ -85379,12 +36742,10 @@
if test x"$DEST" = xSHARED; then
@@ -88597,7 +90845,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -82793,16 +35667,16 @@
+@@ -85395,16 +36756,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
@@ -88617,7 +90865,7 @@
$as_echo_n "checking how to build vfs_readonly... " >&6; }
if test "$MODULE_vfs_readonly"; then
DEST=$MODULE_vfs_readonly
-@@ -82814,12 +35688,10 @@
+@@ -85416,12 +36777,10 @@
if test x"$DEST" = xSHARED; then
@@ -88632,7 +90880,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -82830,16 +35702,16 @@
+@@ -85432,16 +36791,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
@@ -88652,7 +90900,7 @@
$as_echo_n "checking how to build vfs_cap... " >&6; }
if test "$MODULE_vfs_cap"; then
DEST=$MODULE_vfs_cap
-@@ -82851,12 +35723,10 @@
+@@ -85453,12 +36812,10 @@
if test x"$DEST" = xSHARED; then
@@ -88667,7 +90915,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cap"
-@@ -82867,16 +35737,16 @@
+@@ -85469,16 +36826,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
@@ -88687,7 +90935,7 @@
$as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
if test "$MODULE_vfs_expand_msdfs"; then
DEST=$MODULE_vfs_expand_msdfs
-@@ -82888,12 +35758,10 @@
+@@ -85490,12 +36847,10 @@
if test x"$DEST" = xSHARED; then
@@ -88702,7 +90950,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -82904,16 +35772,16 @@
+@@ -85506,16 +36861,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
@@ -88722,7 +90970,7 @@
$as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
if test "$MODULE_vfs_shadow_copy"; then
DEST=$MODULE_vfs_shadow_copy
-@@ -82925,12 +35793,10 @@
+@@ -85527,12 +36882,10 @@
if test x"$DEST" = xSHARED; then
@@ -88737,7 +90985,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -82941,16 +35807,16 @@
+@@ -85543,16 +36896,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
@@ -88757,7 +91005,7 @@
$as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
if test "$MODULE_vfs_shadow_copy2"; then
DEST=$MODULE_vfs_shadow_copy2
-@@ -82962,12 +35828,10 @@
+@@ -85564,12 +36917,10 @@
if test x"$DEST" = xSHARED; then
@@ -88772,7 +91020,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -82978,16 +35842,16 @@
+@@ -85580,16 +36931,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
@@ -88792,7 +91040,7 @@
$as_echo_n "checking how to build vfs_afsacl... " >&6; }
if test "$MODULE_vfs_afsacl"; then
DEST=$MODULE_vfs_afsacl
-@@ -82999,12 +35863,10 @@
+@@ -85601,12 +36952,10 @@
if test x"$DEST" = xSHARED; then
@@ -88807,7 +91055,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -83015,16 +35877,16 @@
+@@ -85617,16 +36966,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
@@ -88827,7 +91075,7 @@
$as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
if test "$MODULE_vfs_xattr_tdb"; then
DEST=$MODULE_vfs_xattr_tdb
-@@ -83036,12 +35898,10 @@
+@@ -85638,12 +36987,10 @@
if test x"$DEST" = xSHARED; then
@@ -88842,7 +91090,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -83052,16 +35912,16 @@
+@@ -85654,16 +37001,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
@@ -88862,7 +91110,7 @@
$as_echo_n "checking how to build vfs_posixacl... " >&6; }
if test "$MODULE_vfs_posixacl"; then
DEST=$MODULE_vfs_posixacl
-@@ -83073,12 +35933,10 @@
+@@ -85675,12 +37022,10 @@
if test x"$DEST" = xSHARED; then
@@ -88877,7 +91125,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -83089,16 +35947,16 @@
+@@ -85691,16 +37036,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
@@ -88897,7 +91145,7 @@
$as_echo_n "checking how to build vfs_aixacl... " >&6; }
if test "$MODULE_vfs_aixacl"; then
DEST=$MODULE_vfs_aixacl
-@@ -83110,12 +35968,10 @@
+@@ -85712,12 +37057,10 @@
if test x"$DEST" = xSHARED; then
@@ -88912,7 +91160,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -83126,16 +35982,16 @@
+@@ -85728,16 +37071,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
@@ -88932,7 +91180,7 @@
$as_echo_n "checking how to build vfs_aixacl2... " >&6; }
if test "$MODULE_vfs_aixacl2"; then
DEST=$MODULE_vfs_aixacl2
-@@ -83147,12 +36003,10 @@
+@@ -85749,12 +37092,10 @@
if test x"$DEST" = xSHARED; then
@@ -88947,7 +91195,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -83163,16 +36017,16 @@
+@@ -85765,16 +37106,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
@@ -88967,7 +91215,7 @@
$as_echo_n "checking how to build vfs_solarisacl... " >&6; }
if test "$MODULE_vfs_solarisacl"; then
DEST=$MODULE_vfs_solarisacl
-@@ -83184,12 +36038,10 @@
+@@ -85786,12 +37127,10 @@
if test x"$DEST" = xSHARED; then
@@ -88982,7 +91230,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -83200,16 +36052,16 @@
+@@ -85802,16 +37141,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
@@ -89002,7 +91250,7 @@
$as_echo_n "checking how to build vfs_irixacl... " >&6; }
if test "$MODULE_vfs_irixacl"; then
DEST=$MODULE_vfs_irixacl
-@@ -83221,12 +36073,10 @@
+@@ -85823,12 +37162,10 @@
if test x"$DEST" = xSHARED; then
@@ -89017,7 +91265,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -83237,16 +36087,16 @@
+@@ -85839,16 +37176,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
@@ -89037,7 +91285,7 @@
$as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
if test "$MODULE_vfs_hpuxacl"; then
DEST=$MODULE_vfs_hpuxacl
-@@ -83258,12 +36108,10 @@
+@@ -85860,12 +37197,10 @@
if test x"$DEST" = xSHARED; then
@@ -89052,7 +91300,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -83274,16 +36122,16 @@
+@@ -85876,16 +37211,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
@@ -89072,7 +91320,7 @@
$as_echo_n "checking how to build vfs_tru64acl... " >&6; }
if test "$MODULE_vfs_tru64acl"; then
DEST=$MODULE_vfs_tru64acl
-@@ -83295,12 +36143,10 @@
+@@ -85897,12 +37232,10 @@
if test x"$DEST" = xSHARED; then
@@ -89087,7 +91335,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -83311,16 +36157,16 @@
+@@ -85913,16 +37246,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
@@ -89107,7 +91355,7 @@
$as_echo_n "checking how to build vfs_catia... " >&6; }
if test "$MODULE_vfs_catia"; then
DEST=$MODULE_vfs_catia
-@@ -83332,12 +36178,10 @@
+@@ -85934,12 +37267,10 @@
if test x"$DEST" = xSHARED; then
@@ -89122,7 +91370,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_catia"
-@@ -83348,16 +36192,16 @@
+@@ -85950,16 +37281,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
@@ -89142,7 +91390,7 @@
$as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
if test "$MODULE_vfs_streams_xattr"; then
DEST=$MODULE_vfs_streams_xattr
-@@ -83369,12 +36213,10 @@
+@@ -85971,12 +37302,10 @@
if test x"$DEST" = xSHARED; then
@@ -89157,7 +91405,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -83385,16 +36227,16 @@
+@@ -85987,16 +37316,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
@@ -89177,7 +91425,7 @@
$as_echo_n "checking how to build vfs_streams_depot... " >&6; }
if test "$MODULE_vfs_streams_depot"; then
DEST=$MODULE_vfs_streams_depot
-@@ -83406,12 +36248,10 @@
+@@ -86008,12 +37337,10 @@
if test x"$DEST" = xSHARED; then
@@ -89192,7 +91440,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -83422,16 +36262,16 @@
+@@ -86024,16 +37351,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
@@ -89212,7 +91460,7 @@
$as_echo_n "checking how to build vfs_cacheprime... " >&6; }
if test "$MODULE_vfs_cacheprime"; then
DEST=$MODULE_vfs_cacheprime
-@@ -83443,12 +36283,10 @@
+@@ -86045,12 +37372,10 @@
if test x"$DEST" = xSHARED; then
@@ -89227,7 +91475,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -83459,16 +36297,16 @@
+@@ -86061,16 +37386,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
@@ -89247,7 +91495,7 @@
$as_echo_n "checking how to build vfs_prealloc... " >&6; }
if test "$MODULE_vfs_prealloc"; then
DEST=$MODULE_vfs_prealloc
-@@ -83480,12 +36318,10 @@
+@@ -86082,12 +37407,10 @@
if test x"$DEST" = xSHARED; then
@@ -89262,7 +91510,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -83496,16 +36332,16 @@
+@@ -86098,16 +37421,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
@@ -89282,7 +91530,7 @@
$as_echo_n "checking how to build vfs_commit... " >&6; }
if test "$MODULE_vfs_commit"; then
DEST=$MODULE_vfs_commit
-@@ -83517,12 +36353,10 @@
+@@ -86119,12 +37442,10 @@
if test x"$DEST" = xSHARED; then
@@ -89297,7 +91545,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_commit"
-@@ -83533,16 +36367,16 @@
+@@ -86135,16 +37456,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
@@ -89317,7 +91565,7 @@
$as_echo_n "checking how to build vfs_gpfs... " >&6; }
if test "$MODULE_vfs_gpfs"; then
DEST=$MODULE_vfs_gpfs
-@@ -83554,12 +36388,10 @@
+@@ -86156,12 +37477,10 @@
if test x"$DEST" = xSHARED; then
@@ -89332,7 +91580,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -83570,16 +36402,16 @@
+@@ -86172,16 +37491,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
@@ -89352,7 +91600,7 @@
$as_echo_n "checking how to build vfs_readahead... " >&6; }
if test "$MODULE_vfs_readahead"; then
DEST=$MODULE_vfs_readahead
-@@ -83591,12 +36423,10 @@
+@@ -86193,12 +37512,10 @@
if test x"$DEST" = xSHARED; then
@@ -89367,7 +91615,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -83607,16 +36437,16 @@
+@@ -86209,16 +37526,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
@@ -89387,7 +91635,7 @@
$as_echo_n "checking how to build vfs_tsmsm... " >&6; }
if test "$MODULE_vfs_tsmsm"; then
DEST=$MODULE_vfs_tsmsm
-@@ -83628,12 +36458,10 @@
+@@ -86230,12 +37547,10 @@
if test x"$DEST" = xSHARED; then
@@ -89402,7 +91650,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -83644,16 +36472,16 @@
+@@ -86246,16 +37561,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
@@ -89422,7 +91670,7 @@
$as_echo_n "checking how to build vfs_fileid... " >&6; }
if test "$MODULE_vfs_fileid"; then
DEST=$MODULE_vfs_fileid
-@@ -83665,12 +36493,10 @@
+@@ -86267,12 +37582,10 @@
if test x"$DEST" = xSHARED; then
@@ -89437,7 +91685,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -83681,16 +36507,16 @@
+@@ -86283,16 +37596,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
@@ -89457,7 +91705,7 @@
$as_echo_n "checking how to build vfs_aio_fork... " >&6; }
if test "$MODULE_vfs_aio_fork"; then
DEST=$MODULE_vfs_aio_fork
-@@ -83702,12 +36528,10 @@
+@@ -86304,12 +37617,10 @@
if test x"$DEST" = xSHARED; then
@@ -89472,7 +91720,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -83718,16 +36542,16 @@
+@@ -86320,16 +37631,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
@@ -89492,7 +91740,7 @@
$as_echo_n "checking how to build vfs_preopen... " >&6; }
if test "$MODULE_vfs_preopen"; then
DEST=$MODULE_vfs_preopen
-@@ -83739,12 +36563,10 @@
+@@ -86341,12 +37652,10 @@
if test x"$DEST" = xSHARED; then
@@ -89507,7 +91755,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -83755,16 +36577,16 @@
+@@ -86357,16 +37666,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
@@ -89527,7 +91775,7 @@
$as_echo_n "checking how to build vfs_syncops... " >&6; }
if test "$MODULE_vfs_syncops"; then
DEST=$MODULE_vfs_syncops
-@@ -83776,12 +36598,10 @@
+@@ -86378,12 +37687,10 @@
if test x"$DEST" = xSHARED; then
@@ -89542,7 +91790,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -83792,16 +36612,16 @@
+@@ -86394,16 +37701,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
@@ -89562,7 +91810,7 @@
$as_echo_n "checking how to build vfs_zfsacl... " >&6; }
if test "$MODULE_vfs_zfsacl"; then
DEST=$MODULE_vfs_zfsacl
-@@ -83813,12 +36633,10 @@
+@@ -86415,12 +37722,10 @@
if test x"$DEST" = xSHARED; then
@@ -89577,7 +91825,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -83829,16 +36647,16 @@
+@@ -86431,16 +37736,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
@@ -89597,7 +91845,7 @@
$as_echo_n "checking how to build vfs_notify_fam... " >&6; }
if test "$MODULE_vfs_notify_fam"; then
DEST=$MODULE_vfs_notify_fam
-@@ -83850,12 +36668,10 @@
+@@ -86452,12 +37757,10 @@
if test x"$DEST" = xSHARED; then
@@ -89612,7 +91860,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -83866,16 +36682,16 @@
+@@ -86468,16 +37771,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
@@ -89632,7 +91880,7 @@
$as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
if test "$MODULE_vfs_acl_xattr"; then
DEST=$MODULE_vfs_acl_xattr
-@@ -83887,12 +36703,10 @@
+@@ -86489,12 +37792,10 @@
if test x"$DEST" = xSHARED; then
@@ -89647,7 +91895,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -83903,16 +36717,16 @@
+@@ -86505,16 +37806,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
@@ -89667,7 +91915,7 @@
$as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
if test "$MODULE_vfs_acl_tdb"; then
DEST=$MODULE_vfs_acl_tdb
-@@ -83924,12 +36738,10 @@
+@@ -86526,12 +37827,10 @@
if test x"$DEST" = xSHARED; then
@@ -89682,7 +91930,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -83940,16 +36752,16 @@
+@@ -86542,16 +37841,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
@@ -89702,7 +91950,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
-@@ -83961,12 +36773,10 @@
+@@ -86563,12 +37862,10 @@
if test x"$DEST" = xSHARED; then
@@ -89717,7 +91965,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -83977,16 +36787,16 @@
+@@ -86579,16 +37876,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
@@ -89737,7 +91985,7 @@
$as_echo_n "checking how to build vfs_onefs... " >&6; }
if test "$MODULE_vfs_onefs"; then
DEST=$MODULE_vfs_onefs
-@@ -83998,12 +36808,10 @@
+@@ -86600,12 +37897,10 @@
if test x"$DEST" = xSHARED; then
@@ -89752,7 +92000,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -84014,16 +36822,16 @@
+@@ -86616,16 +37911,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
@@ -89772,7 +92020,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
-@@ -84035,12 +36843,10 @@
+@@ -86637,12 +37932,10 @@
if test x"$DEST" = xSHARED; then
@@ -89787,7 +92035,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -84051,16 +36857,16 @@
+@@ -86653,16 +37946,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
@@ -89807,7 +92055,7 @@
$as_echo_n "checking how to build vfs_dirsort... " >&6; }
if test "$MODULE_vfs_dirsort"; then
DEST=$MODULE_vfs_dirsort
-@@ -84072,12 +36878,10 @@
+@@ -86674,12 +37967,10 @@
if test x"$DEST" = xSHARED; then
@@ -89822,7 +92070,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -84088,11 +36892,11 @@
+@@ -86690,11 +37981,11 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
@@ -89836,7 +92084,7 @@
$as_echo "not" >&6; }
fi
-@@ -84114,7 +36918,7 @@
+@@ -86716,7 +38007,7 @@
@@ -89845,7 +92093,7 @@
$as_echo_n "checking how to build perfcount_onefs... " >&6; }
if test "$MODULE_perfcount_onefs"; then
DEST=$MODULE_perfcount_onefs
-@@ -84126,12 +36930,10 @@
+@@ -86728,12 +38019,10 @@
if test x"$DEST" = xSHARED; then
@@ -89860,7 +92108,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -84142,16 +36944,16 @@
+@@ -86744,16 +38033,16 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
@@ -89880,7 +92128,7 @@
$as_echo_n "checking how to build perfcount_test... " >&6; }
if test "$MODULE_perfcount_test"; then
DEST=$MODULE_perfcount_test
-@@ -84163,12 +36965,10 @@
+@@ -86765,12 +38054,10 @@
if test x"$DEST" = xSHARED; then
@@ -89895,7 +92143,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_test"
-@@ -84179,11 +36979,11 @@
+@@ -86781,11 +38068,11 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
@@ -89909,7 +92157,7 @@
$as_echo "not" >&6; }
fi
-@@ -84204,7 +37004,7 @@
+@@ -86806,7 +38093,7 @@
@@ -89918,7 +92166,7 @@
$as_echo_n "checking how to build gpext_registry... " >&6; }
if test "$MODULE_gpext_registry"; then
DEST=$MODULE_gpext_registry
-@@ -84216,12 +37016,10 @@
+@@ -86818,12 +38105,10 @@
if test x"$DEST" = xSHARED; then
@@ -89933,7 +92181,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_registry"
-@@ -84232,16 +37030,16 @@
+@@ -86834,16 +38119,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
@@ -89953,7 +92201,7 @@
$as_echo_n "checking how to build gpext_scripts... " >&6; }
if test "$MODULE_gpext_scripts"; then
DEST=$MODULE_gpext_scripts
-@@ -84253,12 +37051,10 @@
+@@ -86855,12 +38140,10 @@
if test x"$DEST" = xSHARED; then
@@ -89968,7 +92216,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -84269,16 +37065,16 @@
+@@ -86871,16 +38154,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
@@ -89988,7 +92236,7 @@
$as_echo_n "checking how to build gpext_security... " >&6; }
if test "$MODULE_gpext_security"; then
DEST=$MODULE_gpext_security
-@@ -84290,12 +37086,10 @@
+@@ -86892,12 +38175,10 @@
if test x"$DEST" = xSHARED; then
@@ -90003,7 +92251,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_security"
-@@ -84306,11 +37100,11 @@
+@@ -86908,11 +38189,11 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
@@ -90017,7 +92265,7 @@
$as_echo "not" >&6; }
fi
-@@ -84346,18 +37140,16 @@
+@@ -86948,18 +38229,16 @@
#################################################
# If run from the build farm, enable NASTY hacks
#################################################
@@ -90040,7 +92288,7 @@
$as_echo "no" >&6; }
fi
-@@ -84374,11 +37166,11 @@
+@@ -86976,11 +38255,11 @@
rt_signal_lease_works=yes
rt_signal_aio_works=yes
@@ -90055,7 +92303,7 @@
$as_echo "cross" >&6; }
# cross compiling, I hope you know what you are doing
-@@ -84386,11 +37178,7 @@
+@@ -86988,11 +38267,7 @@
else
@@ -90068,7 +92316,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -84446,41 +37234,16 @@
+@@ -87051,41 +38326,16 @@
}
_ACEOF
@@ -90114,7 +92362,7 @@
/* end confdefs.h. */
int
-@@ -84491,61 +37254,31 @@
+@@ -87096,61 +38346,31 @@
return 0;
}
_ACEOF
@@ -90153,8 +92401,8 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+
-
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -90183,7 +92431,7 @@
$as_echo "no" >&6; }
case "$ac_status" in
1|11|101|111) rt_signal_lease_ok=no ;;
-@@ -84559,13 +37292,9 @@
+@@ -87164,13 +38384,9 @@
# no RT_SIGNAL bug, we are golden
@@ -90199,7 +92447,7 @@
/* end confdefs.h. */
int
-@@ -84576,65 +37305,39 @@
+@@ -87181,65 +38397,39 @@
return 0;
}
_ACEOF
@@ -90274,7 +92522,7 @@
enableval=$enable_merged_build; enable_merged_build=$enableval
else
enable_merged_build=auto
-@@ -84643,9 +37346,7 @@
+@@ -87248,9 +38438,7 @@
if test x"$enable_merged_build" = x"yes" -a \
x"$merged_build_possible" = x"no" ; then
@@ -90285,10 +92533,53 @@
fi
-@@ -84665,9 +37366,9 @@
+@@ -87273,9 +38461,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
++if test "${ac_cv_path_PYTHON+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PYTHON in
+@@ -87288,14 +38476,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
- # 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
+ ;;
+@@ -87303,10 +38491,10 @@
+ fi
+ PYTHON=$ac_cv_path_PYTHON
+ if test -n "$PYTHON"; then
+- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+ $as_echo "$PYTHON" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -87317,9 +38505,9 @@
+ else
+ # Extract the first word of "python[$PYTHON_VER]", so it can be a program name with args.
+ set dummy python$PYTHON_VER; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -90297,7 +92588,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -84680,14 +37381,14 @@
+@@ -87332,14 +38520,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90315,7 +92606,7 @@
IFS=$as_save_IFS
;;
-@@ -84695,17 +37396,17 @@
+@@ -87347,10 +38535,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -90328,7 +92619,8 @@
$as_echo "no" >&6; }
fi
-
+@@ -87358,7 +38546,7 @@
+ fi
if test -z "$PYTHON"; then
working_python=no
- { $as_echo "$as_me:$LINENO: WARNING: No python found" >&5
@@ -90336,7 +92628,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -84716,9 +37417,9 @@
+@@ -87369,9 +38557,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
@@ -90348,7 +92640,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84731,14 +37432,14 @@
+@@ -87384,14 +38572,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90366,7 +92658,7 @@
IFS=$as_save_IFS
;;
-@@ -84746,10 +37447,10 @@
+@@ -87399,10 +38587,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90379,10 +92671,10 @@
$as_echo "no" >&6; }
fi
-@@ -84760,9 +37461,9 @@
+@@ -87413,9 +38601,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
+ # Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args.
+ set dummy python$PYTHON_VER-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -90391,7 +92683,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84775,14 +37476,14 @@
+@@ -87428,14 +38616,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90409,7 +92701,7 @@
IFS=$as_save_IFS
;;
-@@ -84790,10 +37491,10 @@
+@@ -87443,10 +38631,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90422,7 +92714,7 @@
$as_echo "no" >&6; }
fi
-@@ -84801,7 +37502,7 @@
+@@ -87454,7 +38642,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -90431,7 +92723,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -84811,11 +37512,7 @@
+@@ -87464,11 +38652,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90443,8 +92735,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -84831,42 +37528,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -87485,42 +38669,15 @@
return 0;
}
_ACEOF
@@ -90490,7 +92782,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84878,11 +37548,7 @@
+@@ -87532,11 +38689,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90502,8 +92794,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -84898,42 +37564,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -87553,42 +38706,15 @@
return 0;
}
_ACEOF
@@ -90549,7 +92841,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -84948,11 +37587,7 @@
+@@ -87603,11 +38729,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90561,8 +92853,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -84968,42 +37603,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -87624,42 +38746,15 @@
return 0;
}
_ACEOF
@@ -90608,7 +92900,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85015,11 +37623,7 @@
+@@ -87671,11 +38766,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90620,8 +92912,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -85035,42 +37639,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -87692,42 +38783,15 @@
return 0;
}
_ACEOF
@@ -90667,7 +92959,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85100,11 +37677,7 @@
+@@ -87757,11 +38821,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -90679,8 +92971,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -85120,64 +37693,37 @@
+ #undef HAVE_UINTPTR_T
+@@ -87778,64 +38838,37 @@
return 0;
}
_ACEOF
@@ -90753,10 +93045,53 @@
$as_echo "$merged_build_possible" >&6; }
# Enable merged build automatically if possible, when in developer mode
-@@ -85230,9 +37776,9 @@
+@@ -87891,9 +38924,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
++if test "${ac_cv_path_PYTHON+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PYTHON in
+@@ -87906,14 +38939,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
- # 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
+ ;;
+@@ -87921,10 +38954,10 @@
+ fi
+ PYTHON=$ac_cv_path_PYTHON
+ if test -n "$PYTHON"; then
+- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+ $as_echo "$PYTHON" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -87935,9 +38968,9 @@
+ else
+ # Extract the first word of "python[$PYTHON_VER]", so it can be a program name with args.
+ set dummy python$PYTHON_VER; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -90765,7 +93100,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -85245,14 +37791,14 @@
+@@ -87950,14 +38983,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90783,7 +93118,7 @@
IFS=$as_save_IFS
;;
-@@ -85260,17 +37806,17 @@
+@@ -87965,10 +38998,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -90796,7 +93131,8 @@
$as_echo "no" >&6; }
fi
-
+@@ -87976,7 +39009,7 @@
+ fi
if test -z "$PYTHON"; then
working_python=no
- { $as_echo "$as_me:$LINENO: WARNING: No python found" >&5
@@ -90804,7 +93140,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -85281,9 +37827,9 @@
+@@ -87987,9 +39020,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
@@ -90816,7 +93152,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85296,14 +37842,14 @@
+@@ -88002,14 +39035,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90834,7 +93170,7 @@
IFS=$as_save_IFS
;;
-@@ -85311,10 +37857,10 @@
+@@ -88017,10 +39050,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90847,10 +93183,10 @@
$as_echo "no" >&6; }
fi
-@@ -85325,9 +37871,9 @@
+@@ -88031,9 +39064,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
+ # Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args.
+ set dummy python$PYTHON_VER-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -90859,7 +93195,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85340,14 +37886,14 @@
+@@ -88046,14 +39079,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90877,7 +93213,7 @@
IFS=$as_save_IFS
;;
-@@ -85355,10 +37901,10 @@
+@@ -88061,10 +39094,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90890,7 +93226,7 @@
$as_echo "no" >&6; }
fi
-@@ -85366,7 +37912,7 @@
+@@ -88072,7 +39105,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -90899,7 +93235,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -85376,11 +37922,7 @@
+@@ -88082,11 +39115,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90911,8 +93247,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -85396,42 +37938,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -88103,42 +39132,15 @@
return 0;
}
_ACEOF
@@ -90958,7 +93294,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85443,11 +37958,7 @@
+@@ -88150,11 +39152,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90970,8 +93306,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -85463,42 +37974,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -88171,42 +39169,15 @@
return 0;
}
_ACEOF
@@ -91017,7 +93353,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85513,11 +37997,7 @@
+@@ -88221,11 +39192,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -91029,8 +93365,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -85533,42 +38013,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -88242,42 +39209,15 @@
return 0;
}
_ACEOF
@@ -91076,7 +93412,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85580,11 +38033,7 @@
+@@ -88289,11 +39229,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -91088,8 +93424,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -85600,42 +38049,15 @@
+ #undef HAVE_UINTPTR_T
+@@ -88310,42 +39246,15 @@
return 0;
}
_ACEOF
@@ -91135,7 +93471,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85665,11 +38087,7 @@
+@@ -88375,11 +39284,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -91147,8 +93483,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* we have our own configure tests */
-@@ -85685,52 +38103,25 @@
+ #undef HAVE_UINTPTR_T
+@@ -88396,52 +39301,25 @@
return 0;
}
_ACEOF
@@ -91206,7 +93542,7 @@
$as_echo "yes" >&6; }
-@@ -85758,20 +38149,18 @@
+@@ -88469,20 +39347,18 @@
else
@@ -91231,10 +93567,18 @@
$as_echo "$pythondir" >&6; }
-@@ -85794,545 +38183,125 @@
+@@ -88497,553 +39373,133 @@
+- MAKE_SETTINGS="$MAKE_SETTINGS
+-LIBREPLACE_EXT_ENABLE =
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"LIBREPLACE_EXT\"} = \"\";"
+-
+-
+-
-MAKE_SETTINGS="$MAKE_SETTINGS
-LIBREPLACE_NETWORK_LIBS = ${LIBREPLACE_NETWORK_LIBS}
-LIBREPLACE_NETWORK_CFLAGS =
@@ -91248,7 +93592,7 @@
-LIBREPLACE_NETWORK_ENABLE =
-"
-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{LIBREPLACE_NETWORK} = \"\";"
+-\$enabled{\"LIBREPLACE_NETWORK\"} = \"\";"
-
-
-
@@ -91447,7 +93791,12 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
++ MAKE_SETTINGS="$MAKE_SETTINGS
++LIBREPLACE_EXT_ENABLE =
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"LIBREPLACE_EXT\"} = \"\";"
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -91455,6 +93804,10 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+
+-fi
+
+-done
+MAKE_SETTINGS="$MAKE_SETTINGS
+LIBREPLACE_NETWORK_LIBS = ${LIBREPLACE_NETWORK_LIBS}
+LIBREPLACE_NETWORK_CFLAGS =
@@ -91462,16 +93815,7 @@
+LIBREPLACE_NETWORK_LDFLAGS =
+"
--fi
--done
-
-+ MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_NETWORK_ENABLE =
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{LIBREPLACE_NETWORK} = \"\";"
-
-for ac_header in readline/history.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -91523,15 +93867,15 @@
- ac_header_compiler=no
-fi
++ MAKE_SETTINGS="$MAKE_SETTINGS
++LIBREPLACE_NETWORK_ENABLE =
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"LIBREPLACE_NETWORK\"} = \"\";"
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_CFLAGS = -I../lib/replace
-+LIBREPLACE_ENABLE = YES
-+LIBREPLACE_OBJ_FILES = ${LIBREPLACE_OBJS}
-+"
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -91565,6 +93909,18 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_header_preproc=no
+-fi
++MAKE_SETTINGS="$MAKE_SETTINGS
++LIBREPLACE_CFLAGS = -I../lib/replace
++LIBREPLACE_ENABLE = YES
++LIBREPLACE_OBJ_FILES = ${LIBREPLACE_OBJS}
++"
+
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
+###################################
+# Start Subsystem LIBREPLACE
@@ -91576,14 +93932,6 @@
+###################################
+"
-- ac_header_preproc=no
--fi
-
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -91633,13 +93981,17 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
++LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
+
+-fi
+
+-done
+MAKE_SETTINGS="$MAKE_SETTINGS
+LIBREPLACE_HOSTCC_CFLAGS = -I../lib/replace
+LIBREPLACE_HOSTCC_ENABLE = YES
+LIBREPLACE_HOSTCC_OBJ_FILES = ${LIBREPLACE_HOSTCC_OBJS}
+"
--fi
+SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
+###################################
+# Start Subsystem LIBREPLACE_HOSTCC
@@ -91651,24 +94003,11 @@
+###################################
+"
--done
+###############################################
+# Readline included by default unless explicitly asked not to
+test "${with_readline+set}" != "set" && with_readline=yes
-+EXTERNAL_READLINE=no
-+# test for where we get readline() from
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
-+$as_echo_n "checking whether to use readline... " >&6; }
-
-+# Check whether --with-readline was given.
-+if test "${with_readline+set}" = set; then :
-+ withval=$with_readline; case "$with_readline" in
-+ yes)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -91694,6 +94033,18 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
++EXTERNAL_READLINE=no
++# test for where we get readline() from
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
++$as_echo_n "checking whether to use readline... " >&6; }
++
++# Check whether --with-readline was given.
++if test "${with_readline+set}" = set; then :
++ withval=$with_readline; case "$with_readline" in
++ yes)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
+ for ac_header in readline.h history.h readline/readline.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -91857,7 +94208,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86350,63 +38319,32 @@
+@@ -89061,63 +39517,32 @@
return 0;
}
_ACEOF
@@ -91932,7 +94283,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86424,43 +38362,18 @@
+@@ -89135,43 +39560,18 @@
return 0;
}
_ACEOF
@@ -91982,7 +94333,7 @@
TERMLIBS="-lreadline $TERMLIBS"
EXTERNAL_READLINE=yes
break
-@@ -86474,11 +38387,11 @@
+@@ -89185,11 +39585,11 @@
;;
no)
@@ -91996,7 +94347,7 @@
$as_echo "yes" >&6; }
# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -86490,151 +38403,12 @@
+@@ -89201,151 +39601,12 @@
LDFLAGS="-L$with_readline/lib $LDFLAGS"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
@@ -92154,7 +94505,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -86643,151 +38417,12 @@
+@@ -89354,151 +39615,12 @@
done
@@ -92311,7 +94662,7 @@
_ACEOF
fi
-@@ -86795,168 +38430,26 @@
+@@ -89506,168 +39628,26 @@
done
@@ -92489,7 +94840,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86974,63 +38467,32 @@
+@@ -89685,63 +39665,32 @@
return 0;
}
_ACEOF
@@ -92564,7 +94915,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87048,43 +38510,18 @@
+@@ -89759,43 +39708,18 @@
return 0;
}
_ACEOF
@@ -92614,7 +94965,7 @@
TERMLDFLAGS="-L$with_readline/lib"
TERMCPPFLAGS="-I$with_readline/include"
LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -87104,7 +38541,7 @@
+@@ -89815,7 +39739,7 @@
;;
esac
else
@@ -92623,7 +94974,7 @@
$as_echo "no" >&6; }
fi
-@@ -87113,163 +38550,70 @@
+@@ -89824,18 +39748,14 @@
# The readline API changed slightly from readline3 to readline4, so
# code will generate warnings on one of them unless we have a few
# special cases.
@@ -92631,27 +94982,24 @@
+{ $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
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMLIBS $LIBS"
++if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lreadline $TERMLIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char rl_completion_matches ();
--int
--main ()
--{
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -89848,142 +39768,53 @@
+ int
+ main ()
+ {
-return rl_completion_matches ();
- ;
- return 0;
@@ -92706,39 +95054,30 @@
-{ $as_echo "$as_me:$LINENO: checking whether rl_event_hook is declared" >&5
-$as_echo_n "checking whether rl_event_hook is declared... " >&6; }
-if test "${ac_cv_have_decl_rl_event_hook+set}" = set; then
-+if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lreadline $TERMLIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <readline/readline.h>
-
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char rl_completion_matches ();
- int
- main ()
- {
+-/* end confdefs.h. */
+-
+- #include <stdio.h>
+- #include <readline/readline.h>
+-
+-
+-int
+-main ()
+-{
-#ifndef rl_event_hook
- (void) rl_event_hook;
-#endif
-
-+return rl_completion_matches ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -92758,6 +95097,11 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_rl_event_hook=yes
++return rl_completion_matches ();
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_readline_rl_completion_matches=yes
else
@@ -92776,25 +95120,27 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
-$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; }
-if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_RL_EVENT_HOOK 1
--_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_RL_EVENT_HOOK 1
+-_ACEOF
+$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
++fi
+
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 0
-_ACEOF
-+fi
++# not all readline libs have rl_event_hook or history_list
++ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "
++ #include <stdio.h>
++ #include <readline/readline.h>
-+# 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
@@ -92824,7 +95170,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87287,60 +38631,31 @@
+@@ -90001,60 +39832,31 @@
return 0;
}
_ACEOF
@@ -92895,7 +95241,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -87395,7 +38710,7 @@
+@@ -90109,7 +39911,7 @@
###################################
"
@@ -92904,7 +95250,7 @@
$as_echo "no" >&6; }
fi
-@@ -87404,102 +38719,9 @@
+@@ -90118,102 +39920,9 @@
@@ -93009,7 +95355,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87508,102 +38730,9 @@
+@@ -90222,102 +39931,9 @@
fi
@@ -93099,10 +95445,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
+if test "x$ac_cv_type_u_int32_t" = x""yes; then :
--
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -93114,7 +95460,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87613,151 +38742,12 @@
+@@ -90327,151 +39943,12 @@
fi
@@ -93270,18 +95616,166 @@
_ACEOF
else
-@@ -87767,30 +38757,6 @@
+@@ -90481,151 +39958,12 @@
done
-
+ for ac_header in ifaddrs.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
+- ac_header_compiler=no
+-fi
-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
+- ac_header_preproc=no
+-fi
-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
++if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_IFADDRS_H 1
+ _ACEOF
+
+ else
+@@ -90635,29 +39973,6 @@
+ done
+
+
-
-
-
@@ -93298,10 +95792,17 @@
-
-
-
+-
+-
+-
+-
+-
+-
+-
for ac_header in \
crypt.h \
curses.h \
-@@ -87817,147 +38783,11 @@
+@@ -90683,147 +39998,11 @@
netinet6/in6.h \
libintl.h
@@ -93454,7 +95955,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -87967,42 +38797,6 @@
+@@ -90833,42 +40012,6 @@
done
@@ -93497,10 +95998,16 @@
for ac_func in \
atexit \
cgetent \
-@@ -88041,98 +38835,11 @@
- freehostent \
- writev
-
+@@ -90901,271 +40044,65 @@
+ warn \
+ errx \
+ warnx \
+- flock \
+- getipnodebyname \
+- getipnodebyaddr \
+- freehostent \
+- writev
+-
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -93593,39 +96100,39 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -88143,17 +38850,13 @@
-
-
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-
+-
-{ $as_echo "$as_me:$LINENO: checking for bswap16" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16" >&5
- $as_echo_n "checking for bswap16... " >&6; }
+-$as_echo_n "checking for bswap16... " >&6; }
-if test "${ac_cv_love_func_bswap16+set}" = set; then
-+if test "${ac_cv_love_func_bswap16+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. */
- #ifdef HAVE_SYS_BSWAP_H
- #include <sys/bswap.h>
-@@ -88166,140 +38869,25 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-#ifdef HAVE_SYS_BSWAP_H
+-#include <sys/bswap.h>
+-#endif
+-int
+-main ()
+-{
+-bswap16(0)
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -93647,36 +96154,49 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- eval "ac_cv_love_func_bswap16=yes"
- else
+- eval "ac_cv_love_func_bswap16=yes"
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ flock \
++ getipnodebyname \
++ getipnodebyaddr \
++ freehostent \
++ writev
+
- eval "ac_cv_love_func_bswap16=no"
-+ eval "ac_cv_love_func_bswap16=no"
- fi
--
+-fi
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
fi
++done
- eval "ac_res=\$ac_cv_love_func_bswap16"
+-eval "ac_res=\$ac_cv_love_func_bswap16"
- if false; then
--
+-if false; then
+
-for ac_func in bswap16
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16" >&5
++$as_echo_n "checking for bswap16... " >&6; }
++if test "${ac_cv_love_func_bswap16+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -93699,7 +96219,7 @@
-#endif
-
-#undef $ac_func
--
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -93712,16 +96232,21 @@
- 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. */
++#ifdef HAVE_SYS_BSWAP_H
++#include <sys/bswap.h>
+ #endif
-
--int
--main ()
--{
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++bswap16(0)
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -93744,17 +96269,22 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ eval "ac_cv_love_func_bswap16=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
++ eval "ac_cv_love_func_bswap16=no"
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -93762,6 +96292,11 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++
++eval "ac_res=\$ac_cv_love_func_bswap16"
++
++if false; then
+ for ac_func in bswap16
+do :
+ ac_fn_c_check_func "$LINENO" "bswap16" "ac_cv_func_bswap16"
@@ -93772,7 +96307,7 @@
_ACEOF
fi
-@@ -88315,177 +38903,58 @@
+@@ -91181,11 +40118,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -93782,47 +96317,41 @@
;;
no)
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- ;;
--esac
--
--
--
--
--
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ ;;
+ esac
+@@ -91195,17 +40132,13 @@
+
+
+
-{ $as_echo "$as_me:$LINENO: checking for bswap32" >&5
--$as_echo_n "checking for bswap32... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32" >&5
+ $as_echo_n "checking for bswap32... " >&6; }
-if test "${ac_cv_love_func_bswap32+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
--
++if test "${ac_cv_love_func_bswap32+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#ifdef HAVE_SYS_BSWAP_H
--#include <sys/bswap.h>
--#endif
--int
--main ()
--{
--bswap32(0)
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #ifdef HAVE_SYS_BSWAP_H
+ #include <sys/bswap.h>
+@@ -91218,140 +40151,25 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
@@ -93838,35 +96367,36 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "ac_cv_love_func_bswap32=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ eval "ac_cv_love_func_bswap32=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "ac_cv_love_func_bswap32=no"
--fi
-
++ eval "ac_cv_love_func_bswap32=no"
+ fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
--eval "ac_res=\$ac_cv_love_func_bswap32"
+ eval "ac_res=\$ac_cv_love_func_bswap32"
--if false; then
-
+ if false; then
+-
-for ac_func in bswap32
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32" >&5
-+$as_echo_n "checking for bswap32... " >&6; }
-+if test "${ac_cv_love_func_bswap32+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -93889,7 +96419,7 @@
-#endif
-
-#undef $ac_func
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -93902,21 +96432,16 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifdef HAVE_SYS_BSWAP_H
-+#include <sys/bswap.h>
- #endif
+-#endif
-
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+bswap32(0)
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -93939,22 +96464,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ eval "ac_cv_love_func_bswap32=yes"
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ eval "ac_cv_love_func_bswap32=no"
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -93962,11 +96482,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+
-+eval "ac_res=\$ac_cv_love_func_bswap32"
-+
-+if false; then
+ for ac_func in bswap32
+do :
+ ac_fn_c_check_func "$LINENO" "bswap32" "ac_cv_func_bswap32"
@@ -93977,7 +96492,7 @@
_ACEOF
fi
-@@ -88501,11 +38970,11 @@
+@@ -91367,11 +40185,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -93991,7 +96506,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -88516,25 +38985,21 @@
+@@ -91382,25 +40200,21 @@
@@ -94021,7 +96536,7 @@
ac_cv_struct_winsize=yes; break
fi
rm -f conftest*
-@@ -88544,63 +39009,45 @@
+@@ -91410,63 +40224,45 @@
if test "$ac_cv_struct_winsize" = "yes"; then
@@ -94096,7 +96611,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -88613,35 +39060,14 @@
+@@ -91479,35 +40275,14 @@
return 0;
}
_ACEOF
@@ -94135,7 +96650,7 @@
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -88651,9 +39077,7 @@
+@@ -91517,9 +40292,7 @@
if test "$ac_cv_type_signal" = "void" ; then
@@ -94146,7 +96661,7 @@
fi
-@@ -88684,18 +39108,14 @@
+@@ -91550,18 +40323,14 @@
@@ -94168,7 +96683,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -88712,44 +39132,15 @@
+@@ -91578,44 +40347,15 @@
return 0;
}
_ACEOF
@@ -94218,7 +96733,7 @@
/* end confdefs.h. */
extern int h_errno;
int foo(void) { return h_errno; }
-@@ -88761,44 +39152,19 @@
+@@ -91627,44 +40367,19 @@
return 0;
}
_ACEOF
@@ -94268,7 +96783,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -88806,81 +39172,23 @@
+@@ -91672,81 +40387,23 @@
#define HAVE_H_ERRNO 1
_ACEOF
@@ -94356,11 +96871,168 @@
fi
-@@ -88899,23 +39207,17 @@
+@@ -91762,151 +40419,12 @@
-
+-
+-
+ for ac_header in pty.h util.h libutil.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -91918,23 +40436,17 @@
+
+
+
+-
ac_check_lib_ext_save_LIBS=$LIBS
LIBS="-lutil $OPENPTY_LIBS $LIBS"
@@ -94383,7 +97055,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -88933,54 +39235,28 @@
+@@ -91952,54 +40464,28 @@
return 0;
}
_ACEOF
@@ -94445,7 +97117,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUTIL 1
_ACEOF
-@@ -88997,7 +39273,6 @@
+@@ -92016,7 +40502,6 @@
fi
@@ -94453,7 +97125,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
OPENPTY_ENABLE = YES
"
-@@ -89017,23 +39292,17 @@
+@@ -92036,23 +40521,17 @@
@@ -94480,7 +97152,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89051,54 +39320,28 @@
+@@ -92070,54 +40549,28 @@
return 0;
}
_ACEOF
@@ -94542,7 +97214,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
-@@ -89115,7 +39358,6 @@
+@@ -92134,7 +40587,6 @@
fi
@@ -94550,12 +97222,13 @@
MAKE_SETTINGS="$MAKE_SETTINGS
INTL_ENABLE = YES
"
-@@ -89139,151 +39381,12 @@
+@@ -92158,150 +40610,12 @@
-
- for ac_header in arpa/nameser.h
+-
+ for ac_header in arpa/nameser.h dns.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -94698,15 +97371,14 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "$ac_includes_default"
-+if test "x$ac_cv_header_arpa_nameser_h" = x""yes; then :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_ARPA_NAMESER_H 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
- fi
-@@ -89291,22 +39394,9 @@
+@@ -92311,22 +40625,9 @@
done
@@ -94731,7 +97403,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -89317,46 +39407,10 @@
+@@ -92337,46 +40638,10 @@
#include <arpa/nameser.h>
#endif
@@ -94781,7 +97453,7 @@
_ACEOF
fi
-@@ -89368,9 +39422,9 @@
+@@ -92388,9 +40653,9 @@
@@ -94793,7 +97465,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89385,11 +39439,7 @@
+@@ -92405,11 +40670,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -94806,10 +97478,13 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89414,38 +39464,11 @@
- return 0;
- }
- _ACEOF
+@@ -92431,148 +40692,31 @@
+ {
+ res_search(0,0,0,0,0)
+ ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -94831,28 +97506,29 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
+- eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- done
- eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
- LIBS="$ac_save_LIBS"
-@@ -89457,102 +39480,12 @@
- eval "ac_res=\$ac_cv_funclib_res_search"
-
- if false; then
+- done
+- eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
+- LIBS="$ac_save_LIBS"
+-fi
-
+-fi
+-
+-
+-eval "ac_res=\$ac_cv_funclib_res_search"
+-
+-if false; then
+-
-for ac_func in res_search
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -94933,12 +97609,23 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
--
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ done
++ eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
++ LIBS="$ac_save_LIBS"
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -94946,6 +97633,11 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++
++eval "ac_res=\$ac_cv_funclib_res_search"
++
++if false; then
+ for ac_func in res_search
+do :
+ ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
@@ -94956,7 +97648,7 @@
_ACEOF
fi
-@@ -89572,13 +39505,13 @@
+@@ -92592,13 +40736,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -94972,7 +97664,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -89592,7 +39525,7 @@
+@@ -92612,7 +40756,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -94981,7 +97673,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -89607,9 +39540,9 @@
+@@ -92627,9 +40771,9 @@
@@ -94993,7 +97685,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89624,11 +39557,7 @@
+@@ -92644,11 +40788,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95006,7 +97698,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89653,38 +39582,11 @@
+@@ -92673,38 +40813,11 @@
return 0;
}
_ACEOF
@@ -95048,7 +97740,7 @@
done
eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
LIBS="$ac_save_LIBS"
-@@ -89696,102 +39598,12 @@
+@@ -92716,102 +40829,12 @@
eval "ac_res=\$ac_cv_funclib_res_nsearch"
if false; then
@@ -95156,7 +97848,7 @@
_ACEOF
fi
-@@ -89811,13 +39623,13 @@
+@@ -92831,13 +40854,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95172,7 +97864,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -89831,7 +39643,7 @@
+@@ -92851,7 +40874,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95181,7 +97873,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -89846,9 +39658,9 @@
+@@ -92866,9 +40889,9 @@
@@ -95193,7 +97885,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89863,11 +39675,7 @@
+@@ -92883,11 +40906,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95206,7 +97898,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89892,38 +39700,11 @@
+@@ -92912,38 +40931,11 @@
return 0;
}
_ACEOF
@@ -95248,11 +97940,10 @@
done
eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
LIBS="$ac_save_LIBS"
-@@ -89934,103 +39715,13 @@
-
+@@ -92955,102 +40947,12 @@
eval "ac_res=\$ac_cv_funclib_res_ndestroy"
--if false; then
+ if false; then
-
-for ac_func in res_ndestroy
-do
@@ -95347,7 +98038,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+if false; then
+ for ac_func in res_ndestroy
+do :
+ ac_fn_c_check_func "$LINENO" "res_ndestroy" "ac_cv_func_res_ndestroy"
@@ -95358,7 +98048,7 @@
_ACEOF
fi
-@@ -90050,13 +39741,13 @@
+@@ -93070,13 +40972,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95374,7 +98064,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90070,7 +39761,7 @@
+@@ -93090,7 +40992,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95383,10 +98073,210 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90085,9 +39776,9 @@
+@@ -93104,9 +41006,9 @@
+-{ $as_echo "$as_me:$LINENO: checking for dns_search" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search" >&5
+ $as_echo_n "checking for dns_search... " >&6; }
+-if test "${ac_cv_funclib_dns_search+set}" = set; then
++if test "${ac_cv_funclib_dns_search+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -93121,11 +41023,7 @@
+ *) ac_lib="-l$ac_lib" ;;
+ esac
+ LIBS=" $ac_lib $ac_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #ifdef HAVE_DNS_H
+@@ -93140,38 +41038,11 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ eval "if test -n \"$ac_lib\";then ac_cv_funclib_dns_search=$ac_lib; else ac_cv_funclib_dns_search=yes; fi";break
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ done
+ eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}"
+ LIBS="$ac_save_LIBS"
+@@ -93183,102 +41054,12 @@
+ eval "ac_res=\$ac_cv_funclib_dns_search"
+
+ if false; then
+-
+-for ac_func in dns_search
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ for ac_func in dns_search
++do :
++ ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search"
++if test "x$ac_cv_func_dns_search" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_DNS_SEARCH 1
+ _ACEOF
+
+ fi
+@@ -93298,13 +41079,13 @@
+ #define $ac_tr_func 1
+ _ACEOF
+
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ ;;
+ no)
+ eval "ac_cv_func_dns_search=no"
+ eval "LIB_dns_search="
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ ;;
+ *)
+@@ -93318,7 +41099,7 @@
+ #define $ac_tr_lib 1
+ _ACEOF
+
+- { $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
+ $as_echo "yes, in $ac_res" >&6; }
+ ;;
+ esac
+@@ -93330,9 +41111,9 @@
+
+
+
-{ $as_echo "$as_me:$LINENO: checking for dn_expand" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand" >&5
$as_echo_n "checking for dn_expand... " >&6; }
@@ -95395,7 +98285,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90102,11 +39793,7 @@
+@@ -93347,11 +41128,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95408,7 +98298,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -90131,38 +39818,11 @@
+@@ -93376,38 +41153,11 @@
return 0;
}
_ACEOF
@@ -95450,7 +98340,7 @@
done
eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
LIBS="$ac_save_LIBS"
-@@ -90174,102 +39834,12 @@
+@@ -93419,102 +41169,12 @@
eval "ac_res=\$ac_cv_funclib_dn_expand"
if false; then
@@ -95558,7 +98448,7 @@
_ACEOF
fi
-@@ -90289,13 +39859,13 @@
+@@ -93534,13 +41194,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95574,7 +98464,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90309,7 +39879,7 @@
+@@ -93554,7 +41214,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95583,7 +98473,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90321,18 +39891,14 @@
+@@ -93566,18 +41226,14 @@
@@ -95605,7 +98495,7 @@
/* end confdefs.h. */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -90356,44 +39922,15 @@
+@@ -93601,44 +41257,15 @@
return 0;
}
_ACEOF
@@ -95655,7 +98545,7 @@
/* end confdefs.h. */
extern int _res;
int foo(void) { return _res; }
-@@ -90405,44 +39942,19 @@
+@@ -93650,44 +41277,19 @@
return 0;
}
_ACEOF
@@ -95705,7 +98595,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -90450,18 +39962,7 @@
+@@ -93695,18 +41297,7 @@
#define HAVE__RES 1
_ACEOF
@@ -95725,7 +98615,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -90474,64 +39975,17 @@
+@@ -93719,64 +41310,17 @@
#ifdef HAVE_RESOLV_H
#include <resolv.h>
#endif
@@ -95768,15 +98658,15 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl__res=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_have_decl=0
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__res" >&5
-$as_echo "$ac_cv_have_decl__res" >&6; }
-if test "x$ac_cv_have_decl__res" = x""yes; then
--
+
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL__RES 1
-_ACEOF
@@ -95795,7 +98685,7 @@
fi
-@@ -90597,9 +40051,9 @@
+@@ -93842,9 +41386,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
@@ -95807,7 +98697,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -90610,24 +40064,24 @@
+@@ -93855,24 +41399,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -95837,7 +98727,7 @@
$as_echo "no" >&6; }
fi
-@@ -90656,20 +40110,20 @@
+@@ -93901,20 +41445,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -95865,7 +98755,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90678,19 +40132,17 @@
+@@ -93923,19 +41467,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
@@ -95889,7 +98779,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90698,55 +40150,29 @@
+@@ -93943,55 +41485,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -95953,7 +98843,7 @@
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -90755,52 +40181,24 @@
+@@ -94000,52 +41516,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -96013,7 +98903,7 @@
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -90810,9 +40208,9 @@
+@@ -94055,9 +41543,9 @@
if test x"$LEX_BASENAME" = x"flex"; then
# "flex 2.5.33"
FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -96025,7 +98915,7 @@
$as_echo "$FLEX_VERSION" >&6; }
FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -90825,9 +40223,9 @@
+@@ -94070,9 +41558,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
@@ -96037,7 +98927,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -90838,24 +40236,24 @@
+@@ -94083,24 +41571,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -96067,7 +98957,7 @@
$as_echo "no" >&6; }
fi
-@@ -90868,9 +40266,9 @@
+@@ -94113,9 +41601,9 @@
if test x"$YACC_BASENAME" = x"bison -y"; then
# bison (GNU Bison) 2.3
BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -96079,7 +98969,7 @@
$as_echo "$BISON_VERSION" >&6; }
BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -90878,7 +40276,7 @@
+@@ -94123,7 +41611,7 @@
YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
fi
@@ -96088,7 +98978,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
-@@ -90894,7 +40292,7 @@
+@@ -94139,7 +41627,7 @@
LEX=false
YACC=false
fi
@@ -96097,7 +98987,7 @@
$as_echo "$LEX_YACC" >&6; }
# Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -90902,21 +40300,15 @@
+@@ -94147,21 +41635,15 @@
# if we ever get to using a host kerberos, we might add conditionals here
@@ -96122,23 +99012,35 @@
HAVE_GSSAPI=YES
-@@ -91008,9 +40400,7 @@
- VPATH="$VPATH:\$(HEIMDAL_VPATH)"
+@@ -94241,193 +41723,48 @@
+ SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+ \$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";"
-
+-
+- MAKE_SETTINGS="$MAKE_SETTINGS
+-HEIMDAL_ROKEN_PROGNAME_H_ENABLE = YES
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"HEIMDAL_ROKEN_PROGNAME_H\"} = \"YES\";"
+-
+-fi
+-
+-VPATH="$VPATH:\$(HEIMDAL_VPATH)"
+-
+-
-cat >>confdefs.h <<\_ACEOF
-#define SAMBA4_INTERNAL_HEIMDAL 1
-_ACEOF
-+$as_echo "#define SAMBA4_INTERNAL_HEIMDAL 1" >>confdefs.h
-
-
-
-@@ -91019,170 +40409,27 @@
- "
-
-
-
- for ac_header in execinfo.h
+-
+-
+-SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
+-mkinclude heimdal_build/internal.mk
+-"
+-
+-
+-
+-for ac_header in execinfo.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -96276,10 +99178,31 @@
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
--fi
++
++ MAKE_SETTINGS="$MAKE_SETTINGS
++HEIMDAL_ROKEN_PROGNAME_H_ENABLE = YES
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"HEIMDAL_ROKEN_PROGNAME_H\"} = \"YES\";"
++
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++VPATH="$VPATH:\$(HEIMDAL_VPATH)"
++
++
++$as_echo "#define SAMBA4_INTERNAL_HEIMDAL 1" >>confdefs.h
++
++
++
++SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
++mkinclude heimdal_build/internal.mk
++"
++
++
++for ac_header in execinfo.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_execinfo_h" = x""yes; then :
@@ -96311,7 +99234,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91200,46 +40447,15 @@
+@@ -94445,46 +41782,15 @@
return 0;
}
_ACEOF
@@ -96362,7 +99285,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91257,65 +40473,32 @@
+@@ -94502,65 +41808,32 @@
return 0;
}
_ACEOF
@@ -96436,7 +99359,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. */
-@@ -91356,43 +40539,18 @@
+@@ -94601,43 +41874,18 @@
return 0;
}
_ACEOF
@@ -96486,7 +99409,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BACKTRACE 1
_ACEOF
-@@ -91400,7 +40558,6 @@
+@@ -94645,7 +41893,6 @@
fi
@@ -96494,15 +99417,14 @@
if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -91431,362 +40588,43 @@
- "
+@@ -94731,102 +41978,12 @@
+
-
-
-
--
--for ac_func in sigprocmask sigblock sigaction
+ for ac_func in sigprocmask sigblock sigaction
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -96595,16 +99517,20 @@
-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
++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
+@@ -94835,102 +41992,12 @@
+ done
+
+
-
--fi
--done
--
--
--
--for ac_func in setsid
+ for ac_func in setsid
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -96697,22 +99623,26 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++do :
++ ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
++if test "x$ac_cv_func_setsid" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--
--#################################################
--# these tests are taken from the GNU fileutils package
++#define HAVE_SETSID 1
+ _ACEOF
+
+ fi
+@@ -94939,153 +42006,14 @@
+
+ #################################################
+ # these tests are taken from the GNU fileutils package
-{ $as_echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
--$as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get filesystem space usage..." >&5
+ $as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
-
-
-
--for ac_header in sys/statfs.h sys/statvfs.h sys/vfs.h
+ for ac_header in sys/statfs.h sys/statvfs.h sys/vfs.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -96844,45 +99774,16 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+
-+for ac_func in sigprocmask sigblock sigaction
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+done
-+
-+
-+for ac_func in setsid
-+do :
-+ ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
-+if test "x$ac_cv_func_setsid" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SETSID 1
-+_ACEOF
-
- fi
+-
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+
-+#################################################
-+# these tests are taken from the GNU fileutils package
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get filesystem space usage..." >&5
-+$as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
-+for ac_header in sys/statfs.h sys/statvfs.h sys/vfs.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -96891,7 +99792,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -91796,65 +40634,16 @@
+@@ -95095,65 +42023,16 @@
done
@@ -96962,7 +99863,7 @@
_ACEOF
fi
-@@ -91867,19 +40656,15 @@
+@@ -95166,19 +42045,15 @@
# Test for statvfs64.
if test $space = no; then
# SVR4
@@ -96986,7 +99887,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -91893,51 +40678,22 @@
+@@ -95192,51 +42067,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -97044,7 +99945,7 @@
fi
fi
-@@ -91950,16 +40706,12 @@
+@@ -95249,16 +42095,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -97064,7 +99965,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -91971,64 +40723,33 @@
+@@ -95270,64 +42112,33 @@
return 0;
}
_ACEOF
@@ -97138,7 +100039,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -92040,59 +40761,32 @@
+@@ -95339,59 +42150,32 @@
return 0;
}
_ACEOF
@@ -97206,7 +100107,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -92105,71 +40799,38 @@
+@@ -95404,71 +42188,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -97288,7 +100189,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -92188,71 +40849,38 @@
+@@ -95487,71 +42238,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97370,7 +100271,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -92262,71 +40890,38 @@
+@@ -95561,71 +42279,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -97452,7 +100353,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92342,71 +40937,38 @@
+@@ -95641,71 +42326,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97534,7 +100435,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92426,201 +40988,33 @@
+@@ -95725,201 +42377,33 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -97560,44 +100461,38 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- fu_cv_sys_stat_fs_data=yes
- else
+- fu_cv_sys_stat_fs_data=yes
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-fu_cv_sys_stat_fs_data=no
-+ fu_cv_sys_stat_fs_data=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: $fu_cv_sys_stat_fs_data" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_fs_data" >&5
- $as_echo "$fu_cv_sys_stat_fs_data" >&6; }
- if test $fu_cv_sys_stat_fs_data = yes; then
- space=yes
-
+-$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
+- if test $fu_cv_sys_stat_fs_data = yes; then
+- space=yes
+-
-cat >>confdefs.h <<\_ACEOF
-#define STAT_STATFS2_FS_DATA 1
-_ACEOF
-+$as_echo "#define STAT_STATFS2_FS_DATA 1" >>confdefs.h
-
- fi
- fi
-
-
+- fi
+-fi
-
-
- for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h
+-
+-
+-for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -97727,18 +100622,36 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ fu_cv_sys_stat_fs_data=yes
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++ fu_cv_sys_stat_fs_data=no
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--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: $fu_cv_sys_stat_fs_data" >&5
++$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
++ if test $fu_cv_sys_stat_fs_data = yes; then
++ space=yes
+
++$as_echo "#define STAT_STATFS2_FS_DATA 1" >>confdefs.h
++
++ fi
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -97747,7 +100660,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -92629,19 +41023,15 @@
+@@ -95928,19 +42412,15 @@
done
@@ -97770,7 +100683,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92659,46 +41049,15 @@
+@@ -95958,46 +42438,15 @@
return 0;
}
_ACEOF
@@ -97821,7 +100734,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92716,65 +41075,32 @@
+@@ -96015,65 +42464,32 @@
return 0;
}
_ACEOF
@@ -97895,7 +100808,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. */
-@@ -92815,50 +41141,24 @@
+@@ -96114,50 +42530,24 @@
return 0;
}
_ACEOF
@@ -97952,7 +100865,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
XATTR_LIBS = ${XATTR_LIBS}
XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -92868,18 +41168,14 @@
+@@ -96167,18 +42557,14 @@
if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -97974,7 +100887,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -92902,48 +41198,23 @@
+@@ -96201,48 +42587,23 @@
return 0;
}
_ACEOF
@@ -98028,7 +100941,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -92955,20 +41226,16 @@
+@@ -96254,20 +42615,16 @@
fi
@@ -98053,7 +100966,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/capability.h>
-@@ -92983,117 +41250,55 @@
+@@ -96282,117 +42639,55 @@
}
_ACEOF
@@ -98120,7 +101033,7 @@
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
- samba_cv_HAVE_GETTIMEOFDAY_TZ=cross
+ samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -98187,7 +101100,7 @@
fi
-@@ -93101,7 +41306,7 @@
+@@ -96400,7 +42695,7 @@
INCLUDED_POPT=auto
# Check whether --with-included-popt was given.
@@ -98196,7 +101109,7 @@
withval=$with_included_popt; INCLUDED_POPT=$withval
fi
-@@ -93110,169 +41315,26 @@
+@@ -96409,169 +42704,26 @@
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -98374,7 +101287,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -93290,43 +41352,18 @@
+@@ -96589,43 +42741,18 @@
return 0;
}
_ACEOF
@@ -98424,7 +101337,7 @@
POPT_LIBS="-lpopt"
fi
-@@ -93338,9 +41375,9 @@
+@@ -96637,9 +42764,9 @@
fi
fi
@@ -98436,19 +101349,19 @@
$as_echo "$INCLUDED_POPT" >&6; }
if test x"$INCLUDED_POPT" != x"no"; then
poptdir=""
-@@ -93353,157 +41390,17 @@
- break
+@@ -96653,156 +42780,16 @@
fi
done
-- if test x"$poptdir" = "x"; then
+ if test x"$poptdir" = "x"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find popt source in $poptpaths" >&5
-$as_echo "$as_me: error: cannot find popt source in $poptpaths" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-- POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
++ as_fn_error "cannot find popt source in $poptpaths" "$LINENO" 5
+ fi
+ POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
+
-
-
--
-for ac_header in float.h alloca.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -98586,11 +101499,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+ if test x"$poptdir" = "x"; then
-+ as_fn_error "cannot find popt source in $poptpaths" "$LINENO" 5
-+ fi
-+ POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -98604,7 +101513,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -93542,12 +41439,10 @@
+@@ -96841,12 +42828,10 @@
LOOK_DIRS="/usr /usr/local /sw"
# Check whether --with-libiconv was given.
@@ -98619,7 +101528,7 @@
else
if test "$withval" != "yes" ; then
-@@ -93559,26 +41454,20 @@
+@@ -96858,26 +42843,20 @@
LIBS=-liconv
@@ -98654,7 +101563,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93591,33 +41480,10 @@
+@@ -96890,33 +42869,10 @@
}
_ACEOF
@@ -98691,7 +101600,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93625,29 +41491,17 @@
+@@ -96924,29 +42880,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98726,7 +101635,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93660,33 +41514,10 @@
+@@ -96959,33 +42903,10 @@
}
_ACEOF
@@ -98763,7 +101672,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93694,28 +41525,17 @@
+@@ -96993,28 +42914,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98798,7 +101707,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93728,33 +41548,10 @@
+@@ -97027,33 +42937,10 @@
}
_ACEOF
@@ -98835,7 +101744,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93762,31 +41559,22 @@
+@@ -97061,31 +42948,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98873,7 +101782,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -93799,17 +41587,13 @@
+@@ -97098,17 +42976,13 @@
if test x$ICONV_FOUND = xno; then
@@ -98895,7 +101804,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93822,49 +41606,20 @@
+@@ -97121,49 +42995,20 @@
}
_ACEOF
@@ -98951,7 +101860,7 @@
fi
for i in $LOOK_DIRS ; do
-@@ -93881,24 +41636,20 @@
+@@ -97180,24 +43025,20 @@
LIBS=-liconv
@@ -98983,7 +101892,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93911,33 +41662,10 @@
+@@ -97210,33 +43051,10 @@
}
_ACEOF
@@ -99020,7 +101929,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93945,27 +41673,17 @@
+@@ -97244,27 +43062,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99052,7 +101961,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93978,33 +41696,10 @@
+@@ -97277,33 +43085,10 @@
}
_ACEOF
@@ -99089,7 +101998,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94012,26 +41707,17 @@
+@@ -97311,26 +43096,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99121,10 +102030,11 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -94044,33 +41730,10 @@
+@@ -97342,304 +43118,92 @@
+ return 0;
}
- _ACEOF
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -99148,77 +102058,85 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
+-$as_echo "yes" >&6; };
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GICONV_H 1
-_ACEOF
-+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
-
- ICONV_FOUND=yes
- ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94078,29 +41741,22 @@
- ICONV_LDFLAGS="$LDFLAGS"
-
- else
+-
+- ICONV_FOUND=yes
+- ICONV_CPPFLAGS="$CPPFLAGS"
+- ICONV_LIBS="$LIBS"
+- ICONV_LDFLAGS="$LDFLAGS"
+-
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; };
- fi
+-$as_echo "no" >&6; };
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
-
-
+-fi
-
- 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
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
-@@ -94108,7 +41764,7 @@
- done
-
- if test x"$ICONV_FOUND" = x"no"; then
+-
+-
+-
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+-
+-done
+-
+-if test x"$ICONV_FOUND" = x"no"; then
- { $as_echo "$as_me:$LINENO: WARNING: Sufficient support for iconv function was not found.
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sufficient support for iconv function was not found.
- Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
- $as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
- Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
-@@ -94121,9 +41777,7 @@
-
- else
-
+- Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
+-$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
+- Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
+-
+- MAKE_SETTINGS="$MAKE_SETTINGS
+-ICONV_ENABLE = NO
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"ICONV\"} = \"NO\";"
+-
+-else
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NATIVE_ICONV 1
-_ACEOF
-+$as_echo "#define HAVE_NATIVE_ICONV 1" >>confdefs.h
-
-
- MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -94144,203 +41798,23 @@
-
-
-
-
- for ac_func in writev
+-
+- MAKE_SETTINGS="$MAKE_SETTINGS
+-ICONV_ENABLE = YES
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"ICONV\"} = \"YES\";"
+-
+-fi
+-
+-
+-MAKE_SETTINGS="$MAKE_SETTINGS
+-ICONV_LIBS = ${ICONV_LIBS}
+-ICONV_CFLAGS = ${ICONV_CFLAGS}
+-ICONV_CPPFLAGS = ${ICONV_CPPFLAGS}
+-ICONV_LDFLAGS = ${ICONV_LDFLAGS}
+-"
+-
+-
+-
+-
+-for ac_func in writev
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -99296,14 +102214,26 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; };
++$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
+
- eval "$as_ac_var=no"
-fi
--
++ ICONV_FOUND=yes
++ ICONV_CPPFLAGS="$CPPFLAGS"
++ ICONV_LIBS="$LIBS"
++ ICONV_LDFLAGS="$LDFLAGS"
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; };
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -99311,26 +102241,48 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ ac_fn_c_check_func "$LINENO" "writev" "ac_cv_func_writev"
-+if test "x$ac_cv_func_writev" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_WRITEV 1
- _ACEOF
+-_ACEOF
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++
fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++
++
++ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++ LIBS="$save_LIBS"
++
done
--
- for ac_func in readv
++if test x"$ICONV_FOUND" = x"no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sufficient support for iconv function was not found.
++ Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
++$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
++ Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
++
++ MAKE_SETTINGS="$MAKE_SETTINGS
++ICONV_ENABLE = NO
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"ICONV\"} = \"NO\";"
+
+-for ac_func in readv
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -99340,20 +102292,26 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++$as_echo "#define HAVE_NATIVE_ICONV 1" >>confdefs.h
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
--
++ MAKE_SETTINGS="$MAKE_SETTINGS
++ICONV_ENABLE = YES
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"ICONV\"} = \"YES\";"
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -99367,7 +102325,8 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
++fi
+
-int
-main ()
-{
@@ -99375,7 +102334,23 @@
- ;
- return 0;
-}
--_ACEOF
++
++MAKE_SETTINGS="$MAKE_SETTINGS
++ICONV_LIBS = ${ICONV_LIBS}
++ICONV_CFLAGS = ${ICONV_CFLAGS}
++ICONV_CPPFLAGS = ${ICONV_CPPFLAGS}
++ICONV_LDFLAGS = ${ICONV_LDFLAGS}
++"
++
++
++
++for ac_func in writev
++do :
++ ac_fn_c_check_func "$LINENO" "writev" "ac_cv_func_writev"
++if test "x$ac_cv_func_writev" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_WRITEV 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -99401,10 +102376,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
--fi
--
+ fi
++done
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -99416,6 +102392,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 readv
+do :
+ ac_fn_c_check_func "$LINENO" "readv" "ac_cv_func_readv"
+if test "x$ac_cv_func_readv" = x""yes; then :
@@ -99425,7 +102402,7 @@
_ACEOF
fi
-@@ -94419,151 +41893,12 @@
+@@ -97718,151 +43282,12 @@
@@ -99581,7 +102558,7 @@
_ACEOF
fi
-@@ -94573,23 +41908,17 @@
+@@ -97872,23 +43297,17 @@
@@ -99608,7 +102585,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -94607,54 +41936,28 @@
+@@ -97906,54 +43325,28 @@
return 0;
}
_ACEOF
@@ -99670,7 +102647,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -94670,18 +41973,13 @@
+@@ -97969,18 +43362,13 @@
fi
@@ -99692,7 +102669,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -94699,40 +41997,19 @@
+@@ -97998,40 +43386,19 @@
return 0;
}
_ACEOF
@@ -99735,7 +102712,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -94791,9 +42068,9 @@
+@@ -98090,9 +43457,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
@@ -99747,7 +102724,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -94806,14 +42083,14 @@
+@@ -98105,14 +43472,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99765,7 +102742,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -94822,10 +42099,10 @@
+@@ -98121,10 +43488,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -99778,20 +102755,20 @@
$as_echo "no" >&6; }
fi
-@@ -94841,52 +42118,27 @@
+@@ -98140,52 +43507,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
-- { $as_echo "$as_me:$LINENO: checking for talloc >= $TALLOC_MIN_VERSION" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for talloc >= $TALLOC_MIN_VERSION" >&5
- $as_echo_n "checking for talloc >= $TALLOC_MIN_VERSION... " >&6; }
+- { $as_echo "$as_me:$LINENO: checking for talloc >= 2.0.0" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for talloc >= 2.0.0" >&5
+ $as_echo_n "checking for talloc >= 2.0.0... " >&6; }
- if $PKG_CONFIG --exists 'talloc >= $TALLOC_MIN_VERSION' ; then
+ if $PKG_CONFIG --exists 'talloc >= 2.0.0' ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- LIBTALLOC_CFLAGS="`$PKG_CONFIG --cflags 'talloc >= $TALLOC_MIN_VERSION'`"
+ LIBTALLOC_CFLAGS="`$PKG_CONFIG --cflags 'talloc >= 2.0.0'`"
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $LIBTALLOC_CFLAGS"
- { $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTALLOC_CFLAGS" >&5
@@ -99838,9 +102815,9 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTALLOC_ENABLE = YES
-@@ -94894,22 +42146,16 @@
+@@ -98193,22 +43535,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBTALLOC} = \"YES\";"
+ \$enabled{\"LIBTALLOC\"} = \"YES\";"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -99864,17 +102841,17 @@
-
CFLAGS="$OLD_CFLAGS"
-
-@@ -94924,7 +42170,7 @@
+ ac_cv_LIBTALLOC_libs_only_other="`$PKG_CONFIG --libs-only-other 'talloc >= 2.0.0'` `$PKG_CONFIG --libs-only-L 'talloc >= 2.0.0'`"
+@@ -98269,7 +43605,7 @@
ac_cv_LIBTALLOC_found=yes
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- $PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= $TALLOC_MIN_VERSION'
+ $PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.0'
ac_cv_LIBTALLOC_found=no
-@@ -94954,9 +42200,9 @@
+@@ -98303,9 +43639,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
@@ -99886,7 +102863,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -94969,14 +42215,14 @@
+@@ -98318,14 +43654,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99904,7 +102881,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -94985,10 +42231,10 @@
+@@ -98334,10 +43670,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -99917,20 +102894,20 @@
$as_echo "no" >&6; }
fi
-@@ -95004,52 +42250,27 @@
+@@ -98353,52 +43689,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
-- { $as_echo "$as_me:$LINENO: checking for tdb >= $TDB_MIN_VERSION" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tdb >= $TDB_MIN_VERSION" >&5
- $as_echo_n "checking for tdb >= $TDB_MIN_VERSION... " >&6; }
+- { $as_echo "$as_me:$LINENO: checking for tdb >= 1.1.7" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tdb >= 1.1.7" >&5
+ $as_echo_n "checking for tdb >= 1.1.7... " >&6; }
- if $PKG_CONFIG --exists 'tdb >= $TDB_MIN_VERSION' ; then
+ if $PKG_CONFIG --exists 'tdb >= 1.1.7' ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- LIBTDB_CFLAGS="`$PKG_CONFIG --cflags 'tdb >= $TDB_MIN_VERSION'`"
+ LIBTDB_CFLAGS="`$PKG_CONFIG --cflags 'tdb >= 1.1.7'`"
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $LIBTDB_CFLAGS"
- { $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTDB_CFLAGS" >&5
@@ -99977,9 +102954,9 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTDB_ENABLE = YES
-@@ -95057,22 +42278,16 @@
+@@ -98406,22 +43717,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBTDB} = \"YES\";"
+ \$enabled{\"LIBTDB\"} = \"YES\";"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -100003,17 +102980,17 @@
-
CFLAGS="$OLD_CFLAGS"
-
-@@ -95087,7 +42302,7 @@
+ ac_cv_LIBTDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'tdb >= 1.1.7'` `$PKG_CONFIG --libs-only-L 'tdb >= 1.1.7'`"
+@@ -98482,7 +43787,7 @@
ac_cv_LIBTDB_found=yes
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- $PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= $TDB_MIN_VERSION'
+ $PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.1.7'
ac_cv_LIBTDB_found=no
-@@ -95112,9 +42327,7 @@
+@@ -98507,9 +43812,7 @@
fi
done
if test x"$tdbdir" = "x"; then
@@ -100023,8 +103000,8 @@
+ as_fn_error "cannot find tdb source in $tdbpaths" "$LINENO" 5
fi
TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
- TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o"
-@@ -95127,104 +42340,12 @@
+ TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
+@@ -98522,104 +43825,12 @@
TDB_CFLAGS="-I$tdbdir/include"
@@ -100134,14 +103111,14 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -95232,151 +42353,12 @@
+@@ -98627,151 +43838,12 @@
fi
done
-
-
-
--for ac_header in getopt.h sys/select.h sys/time.h
+ for ac_header in getopt.h sys/select.h sys/time.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -100283,7 +103260,6 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_header in getopt.h sys/select.h sys/time.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -100292,7 +103268,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -95387,17 +42369,13 @@
+@@ -98782,17 +43854,13 @@
@@ -100313,7 +103289,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95408,56 +42386,29 @@
+@@ -98803,56 +43871,29 @@
return 0;
}
_ACEOF
@@ -100377,7 +103353,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95468,41 +42419,18 @@
+@@ -98863,41 +43904,18 @@
return 0;
}
_ACEOF
@@ -100423,7 +103399,7 @@
fi
-@@ -95528,9 +42456,9 @@
+@@ -98928,9 +43946,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
@@ -100435,7 +103411,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -95543,14 +42471,14 @@
+@@ -98943,14 +43961,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100453,7 +103429,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95559,10 +42487,10 @@
+@@ -98959,10 +43977,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100466,20 +103442,20 @@
$as_echo "no" >&6; }
fi
-@@ -95578,52 +42506,27 @@
+@@ -98978,52 +43996,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
-- { $as_echo "$as_me:$LINENO: checking for tevent = $TEVENT_REQUIRED_VERSION" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tevent = $TEVENT_REQUIRED_VERSION" >&5
- $as_echo_n "checking for tevent = $TEVENT_REQUIRED_VERSION... " >&6; }
+- { $as_echo "$as_me:$LINENO: checking for tevent = 0.9.8" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tevent = 0.9.8" >&5
+ $as_echo_n "checking for tevent = 0.9.8... " >&6; }
- if $PKG_CONFIG --exists 'tevent = $TEVENT_REQUIRED_VERSION' ; then
+ if $PKG_CONFIG --exists 'tevent = 0.9.8' ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- LIBTEVENT_CFLAGS="`$PKG_CONFIG --cflags 'tevent = $TEVENT_REQUIRED_VERSION'`"
+ LIBTEVENT_CFLAGS="`$PKG_CONFIG --cflags 'tevent = 0.9.8'`"
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $LIBTEVENT_CFLAGS"
- { $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTEVENT_CFLAGS" >&5
@@ -100526,9 +103502,9 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTEVENT_ENABLE = YES
-@@ -95631,22 +42534,16 @@
+@@ -99031,22 +44024,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBTEVENT} = \"YES\";"
+ \$enabled{\"LIBTEVENT\"} = \"YES\";"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -100552,33 +103528,50 @@
-
CFLAGS="$OLD_CFLAGS"
-
-@@ -95661,7 +42558,7 @@
+ ac_cv_LIBTEVENT_libs_only_other="`$PKG_CONFIG --libs-only-other 'tevent = 0.9.8'` `$PKG_CONFIG --libs-only-L 'tevent = 0.9.8'`"
+@@ -99107,7 +44094,7 @@
ac_cv_LIBTEVENT_found=yes
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- $PKG_CONFIG --errors-to-stdout --print-errors 'tevent = $TEVENT_REQUIRED_VERSION'
+ $PKG_CONFIG --errors-to-stdout --print-errors 'tevent = 0.9.8'
ac_cv_LIBTEVENT_found=no
-@@ -95690,9 +42587,7 @@
- fi
- done
- if test x"$teventdir" = "x"; then
+@@ -99128,281 +44115,50 @@
+
+ if test x"$teventdir" = "x"; then
+ teventdir=""
+- teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
+- for d in $teventpaths; do
+- if test -f "$d/tevent.c"; then
+- teventdir="$d"
+- break;
+- fi
+- done
+- if test x"$teventdir" = "x"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find libtevent source in $teventpaths" >&5
-$as_echo "$as_me: error: cannot find libtevent source in $teventpaths" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
- fi
- fi
-
-@@ -95710,253 +42605,24 @@
- TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
- TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
-
+- fi
+-fi
-
- for ac_header in sys/epoll.h
+-TEVENT_OBJ=""
+-TEVENT_CFLAGS=""
+-TEVENT_LIBS=""
+-
+-
+-
+-
+-TEVENT_CFLAGS="-I$teventdir"
+-
+-TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
+-TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
+-TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
+-TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
+-
+-
+-for ac_header in sys/epoll.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -100720,20 +103713,29 @@
-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" "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
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SYS_EPOLL_H 1
- _ACEOF
-
+-_ACEOF
+-
++ teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
++ for d in $teventpaths; do
++ if test -f "$d/tevent.c"; then
++ teventdir="$d"
++ break;
++ fi
++ done
++ if test x"$teventdir" = "x"; then
++ as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
++ fi
fi
- done
+-done
+-
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
--
- for ac_func in epoll_create
+-for ac_func in epoll_create
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -100750,20 +103752,21 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
--
++TEVENT_CFLAGS="-I$teventdir"
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -100777,7 +103780,11 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
++TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
+
-int
-main ()
-{
@@ -100785,7 +103792,13 @@
- ;
- return 0;
-}
--_ACEOF
++for ac_header in sys/epoll.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_EPOLL_H 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -100811,10 +103824,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
--fi
--
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -100826,6 +103839,9 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++done
++
++for ac_func in 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 :
@@ -100835,7 +103851,7 @@
_ACEOF
fi
-@@ -95965,9 +42631,7 @@
+@@ -99411,9 +44167,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"
@@ -100846,7 +103862,7 @@
fi
-@@ -96029,9 +42693,9 @@
+@@ -99469,9 +44223,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
@@ -100858,7 +103874,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -96044,14 +42708,14 @@
+@@ -99484,14 +44238,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100876,7 +103892,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96060,10 +42724,10 @@
+@@ -99500,10 +44254,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100889,20 +103905,20 @@
$as_echo "no" >&6; }
fi
-@@ -96079,52 +42743,27 @@
+@@ -99519,52 +44273,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
-- { $as_echo "$as_me:$LINENO: checking for ldb = $LDB_REQUIRED_VERSION" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldb = $LDB_REQUIRED_VERSION" >&5
- $as_echo_n "checking for ldb = $LDB_REQUIRED_VERSION... " >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ldb = 0.9.7" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldb = 0.9.7" >&5
+ $as_echo_n "checking for ldb = 0.9.7... " >&6; }
- if $PKG_CONFIG --exists 'ldb = $LDB_REQUIRED_VERSION' ; then
+ if $PKG_CONFIG --exists 'ldb = 0.9.7' ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- LIBLDB_CFLAGS="`$PKG_CONFIG --cflags 'ldb = $LDB_REQUIRED_VERSION'`"
+ LIBLDB_CFLAGS="`$PKG_CONFIG --cflags 'ldb = 0.9.7'`"
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $LIBLDB_CFLAGS"
- { $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBLDB_CFLAGS" >&5
@@ -100949,9 +103965,9 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBLDB_ENABLE = YES
-@@ -96132,22 +42771,16 @@
+@@ -99572,22 +44301,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBLDB} = \"YES\";"
+ \$enabled{\"LIBLDB\"} = \"YES\";"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -100975,17 +103991,17 @@
-
CFLAGS="$OLD_CFLAGS"
-
-@@ -96162,7 +42795,7 @@
+ ac_cv_LIBLDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'ldb = 0.9.7'` `$PKG_CONFIG --libs-only-L 'ldb = 0.9.7'`"
+@@ -99648,7 +44371,7 @@
ac_cv_LIBLDB_found=yes
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- $PKG_CONFIG --errors-to-stdout --print-errors 'ldb = $LDB_REQUIRED_VERSION'
+ $PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.7'
ac_cv_LIBLDB_found=no
-@@ -96208,12 +42841,12 @@
+@@ -99694,12 +44417,12 @@
SQLITE3_LIBS=""
with_sqlite3_support=no
@@ -101000,7 +104016,7 @@
withval=$with_sqlite3; case "$withval" in
yes|no|auto)
with_sqlite3_support=$withval
-@@ -96222,157 +42855,18 @@
+@@ -99708,157 +44431,18 @@
fi
@@ -101164,7 +104180,7 @@
_ACEOF
fi
-@@ -96382,11 +42876,9 @@
+@@ -99868,11 +44452,9 @@
if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101178,7 +104194,7 @@
$as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
fi
-@@ -96401,23 +42893,17 @@
+@@ -99887,23 +44469,17 @@
# now see if we can find the sqlite3 libs in standard paths
@@ -101205,7 +104221,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96435,54 +42921,28 @@
+@@ -99921,54 +44497,28 @@
return 0;
}
_ACEOF
@@ -101267,7 +104283,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF
-@@ -96498,21 +42958,16 @@
+@@ -99984,21 +44534,16 @@
fi
@@ -101293,7 +104309,7 @@
$as_echo "yes" >&6; }
with_sqlite3_support=yes
-@@ -96524,11 +42979,9 @@
+@@ -100010,11 +44555,9 @@
else
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101307,7 +104323,7 @@
$as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
fi
-@@ -96589,7 +43042,7 @@
+@@ -100084,7 +44627,7 @@
use_gnutls=auto
# Check whether --enable-gnutls was given.
@@ -101316,7 +104332,7 @@
enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
use_gnutls=no
fi
-@@ -96603,9 +43056,9 @@
+@@ -100098,9 +44641,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
@@ -101328,7 +104344,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -96618,14 +43071,14 @@
+@@ -100113,14 +44656,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -101346,7 +104362,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96634,10 +43087,10 @@
+@@ -100129,10 +44672,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -101359,20 +104375,20 @@
$as_echo "no" >&6; }
fi
-@@ -96653,52 +43106,27 @@
+@@ -100148,52 +44691,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
-- { $as_echo "$as_me:$LINENO: checking for gnutls < 2.6.0" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls < 2.6.0" >&5
- $as_echo_n "checking for gnutls < 2.6.0... " >&6; }
+- { $as_echo "$as_me:$LINENO: checking for gnutls >= 1.4.0" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 1.4.0" >&5
+ $as_echo_n "checking for gnutls >= 1.4.0... " >&6; }
- if $PKG_CONFIG --exists 'gnutls < 2.6.0' ; then
+ if $PKG_CONFIG --exists 'gnutls >= 1.4.0' ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- GNUTLS_CFLAGS="`$PKG_CONFIG --cflags 'gnutls < 2.6.0'`"
+ GNUTLS_CFLAGS="`$PKG_CONFIG --cflags 'gnutls >= 1.4.0'`"
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
- { $as_echo "$as_me:$LINENO: checking that the C compiler can use the GNUTLS_CFLAGS" >&5
@@ -101419,9 +104435,9 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GNUTLS_ENABLE = YES
-@@ -96706,22 +43134,16 @@
+@@ -100201,22 +44719,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{GNUTLS} = \"YES\";"
+ \$enabled{\"GNUTLS\"} = \"YES\";"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -101445,24 +104461,21 @@
-
CFLAGS="$OLD_CFLAGS"
-
-@@ -96736,7 +43158,7 @@
+ ac_cv_GNUTLS_libs_only_other="`$PKG_CONFIG --libs-only-other 'gnutls >= 1.4.0'` `$PKG_CONFIG --libs-only-L 'gnutls >= 1.4.0'`"
+@@ -100277,7 +44789,7 @@
ac_cv_GNUTLS_found=yes
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- $PKG_CONFIG --errors-to-stdout --print-errors 'gnutls < 2.6.0'
+ $PKG_CONFIG --errors-to-stdout --print-errors 'gnutls >= 1.4.0'
ac_cv_GNUTLS_found=no
-@@ -96753,770 +43175,161 @@
- use_gnutls=no
- fi
+@@ -100297,151 +44809,12 @@
+ fi
--fi
+ if test x$use_gnutls = xauto; then
-
--if test x$use_gnutls = xauto; then
--
-for ac_header in gnutls/gnutls.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -101605,50 +104618,47 @@
-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_header in gnutls/gnutls.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
++if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define HAVE_GNUTLS_GNUTLS_H 1
+ _ACEOF
+
+ fi
+@@ -100450,23 +44823,17 @@
+
+
+
-
--fi
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lgnutls $GNUTLS_LIBS $LIBS"
+
+
+
-
--done
--
--
--
--
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lgnutls $GNUTLS_LIBS $LIBS"
--
--
--
--
- { $as_echo "$as_me:$LINENO: checking for gnutls_global_init in -lgnutls" >&5
--$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5
+ $as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
-if test "${ac_cv_lib_ext_gnutls_gnutls_global_init+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_lib_ext_gnutls_gnutls_global_init+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* 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 gnutls_global_init ();
--int
--main ()
--{
--return gnutls_global_init ();
-- ;
-- return 0;
--}
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -100484,580 +44851,116 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -101670,7 +104680,8 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ext_gnutls_gnutls_global_init=yes;
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_gnutls_gnutls_global_init=yes;
- ac_cv_lib_ext_gnutls=yes
-else
- $as_echo "$as_me: failed program was:" >&5
@@ -101783,7 +104794,7 @@
-GNUTLS_ENABLE = YES
-"
-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{GNUTLS} = \"YES\";"
+-\$enabled{\"GNUTLS\"} = \"YES\";"
-
- { $as_echo "$as_me:$LINENO: checking whether gnutls_x509_crt_set_subject_key_id is declared" >&5
-$as_echo_n "checking whether gnutls_x509_crt_set_subject_key_id is declared... " >&6; }
@@ -101811,16 +104822,7 @@
- ;
- return 0;
-}
-+fi
-+
-+if test x$use_gnutls = xauto; then
-+ for ac_header in gnutls/gnutls.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
-+if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GNUTLS_GNUTLS_H 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -101843,46 +104845,40 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id=no
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" >&5
-$as_echo "$ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" >&6; }
-if test "x$ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" = x""yes; then
-+done
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID 1
-_ACEOF
-
+-
-fi
-
+-
- fi
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lgnutls $GNUTLS_LIBS $LIBS"
-
+-
-MAKE_SETTINGS="$MAKE_SETTINGS
-GNUTLS_LIBS = $GNUTLS_LIBS
-GNUTLS_CFLAGS =
-GNUTLS_CPPFLAGS =
-GNUTLS_LDFLAGS =
-"
-
-
+-
+-
-fi
-if test x$use_gnutls = xyes; then
- #Some older versions have a different type name
- { $as_echo "$as_me:$LINENO: checking for gnutls_datum" >&5
-$as_echo_n "checking for gnutls_datum... " >&6; }
-if test "${ac_cv_type_gnutls_datum+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5
-+$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
-+if test "${ac_cv_lib_ext_gnutls_gnutls_global_init+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_gnutls_datum=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -101924,27 +104920,18 @@
-_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 "gnutls/gnutls.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 gnutls_global_init ();
- int
- main ()
- {
+-
+-int
+-main ()
+-{
-if (sizeof ((gnutls_datum)))
- return 0;
-+return gnutls_global_init ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -101972,39 +104959,26 @@
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_gnutls_gnutls_global_init=yes;
-+ ac_cv_lib_ext_gnutls=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+ ac_cv_lib_ext_gnutls_gnutls_global_init=no;
-+ ac_cv_lib_ext_gnutls=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_gnutls_datum" >&5
-$as_echo "$ac_cv_type_gnutls_datum" >&6; }
-if test "x$ac_cv_type_gnutls_datum" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GNUTLS_DATUM 1
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_gnutls_gnutls_global_init" >&5
-+$as_echo "$ac_cv_lib_ext_gnutls_gnutls_global_init" >&6; }
-+ if test $ac_cv_lib_ext_gnutls_gnutls_global_init = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GNUTLS_GLOBAL_INIT 1
- _ACEOF
-
+-_ACEOF
-
- fi
-+LIBS=$ac_check_lib_ext_save_LIBS
-
+-
+-fi
+-
- { $as_echo "$as_me:$LINENO: checking for gnutls_datum_t" >&5
-$as_echo_n "checking for gnutls_datum_t... " >&6; }
-if test "${ac_cv_type_gnutls_datum_t+set}" = set; then
@@ -102013,15 +104987,12 @@
- ac_cv_type_gnutls_datum_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+if test $ac_cv_lib_ext_gnutls = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBGNUTLS 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include "gnutls/gnutls.h"
-
+-
-int
-main ()
-{
@@ -102056,14 +105027,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include "gnutls/gnutls.h"
-+ case "$GNUTLS_LIBS" in
-+ *-lgnutls*)
-+ ;;
-+ *)
-+ GNUTLS_LIBS="-lgnutls $GNUTLS_LIBS"
-+ ;;
-+ esac
-
+-
-int
-main ()
-{
@@ -102092,42 +105056,72 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--else
++ ac_cv_lib_ext_gnutls=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_lib_ext_gnutls_gnutls_global_init=no;
++ ac_cv_lib_ext_gnutls=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_gnutls_gnutls_global_init" >&5
++$as_echo "$ac_cv_lib_ext_gnutls_gnutls_global_init" >&6; }
++ if test $ac_cv_lib_ext_gnutls_gnutls_global_init = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GNUTLS_GLOBAL_INIT 1
++_ACEOF
- ac_cv_type_gnutls_datum_t=yes
fi
-+ ac_fn_c_check_decl "$LINENO" "gnutls_x509_crt_set_version" "ac_cv_have_decl_gnutls_x509_crt_set_version" "
-+ #include <gnutls/gnutls.h>
-+ #include <gnutls/x509.h>
++LIBS=$ac_check_lib_ext_save_LIBS
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++if test $ac_cv_lib_ext_gnutls = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBGNUTLS 1
++_ACEOF
++
++ case "$GNUTLS_LIBS" in
++ *-lgnutls*)
++ ;;
++ *)
++ GNUTLS_LIBS="-lgnutls $GNUTLS_LIBS"
++ ;;
++ esac
+
+
+ fi
++ ac_fn_c_check_decl "$LINENO" "gnutls_x509_crt_set_version" "ac_cv_have_decl_gnutls_x509_crt_set_version" "
++ #include <gnutls/gnutls.h>
++ #include <gnutls/x509.h>
++
+"
+if test "x$ac_cv_have_decl_gnutls_x509_crt_set_version" = x""yes; then :
-
++
+$as_echo "#define HAVE_GNUTLS_X509_CRT_SET_VERSION 1" >>confdefs.h
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_gnutls_datum_t" >&5
-$as_echo "$ac_cv_type_gnutls_datum_t" >&6; }
-if test "x$ac_cv_type_gnutls_datum_t" = x""yes; then
-+ if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GNUTLS_DATUM_T 1
-_ACEOF
++ if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
++
+ MAKE_SETTINGS="$MAKE_SETTINGS
+GNUTLS_ENABLE = YES
+"
+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{GNUTLS} = \"YES\";"
++\$enabled{\"GNUTLS\"} = \"YES\";"
+
+ ac_fn_c_check_decl "$LINENO" "gnutls_x509_crt_set_subject_key_id" "ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" "
+ #include <gnutls/gnutls.h>
@@ -102321,7 +105315,7 @@
_ACEOF
fi
-@@ -97525,23 +43338,17 @@
+@@ -101066,23 +44969,17 @@
@@ -102348,7 +105342,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97559,54 +43366,28 @@
+@@ -101100,54 +44997,28 @@
return 0;
}
_ACEOF
@@ -102410,7 +105404,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGCRYPT 1
_ACEOF
-@@ -97622,7 +43403,6 @@
+@@ -101163,7 +45034,6 @@
fi
@@ -102418,8 +105412,648 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GCRYPT_LIBS = $GCRYPT_LIBS
GCRYPT_CFLAGS =
-@@ -97660,19 +43440,17 @@
+@@ -101180,7 +45050,7 @@
+ use_netapi=auto
+ # Check whether --enable-netapi was given.
+-if test "${enable_netapi+set}" = set; then
++if test "${enable_netapi+set}" = set; then :
+ enableval=$enable_netapi; if test x$enable_netapi = xno; then
+ use_netapi=no
+ fi
+@@ -101202,151 +45072,12 @@
+ \$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";"
+
+ if test x$use_netapi != xno; then
+-
+-for ac_header in netapi.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ for ac_header in netapi.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "netapi.h" "ac_cv_header_netapi_h" "$ac_includes_default"
++if test "x$ac_cv_header_netapi_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_NETAPI_H 1
+ _ACEOF
+
+ fi
+@@ -101355,23 +45086,17 @@
+
+
+
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS $LIBS"
+
+
+
+-
+- { $as_echo "$as_me:$LINENO: checking for libnetapi_init in -lnetapi" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnetapi_init in -lnetapi" >&5
+ $as_echo_n "checking for libnetapi_init in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_libnetapi_init+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_libnetapi_init+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -101389,54 +45114,28 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_netapi_libnetapi_init=yes;
+ ac_cv_lib_ext_netapi=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ext_netapi_libnetapi_init=no;
++ ac_cv_lib_ext_netapi_libnetapi_init=no;
+ ac_cv_lib_ext_netapi=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_libnetapi_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_libnetapi_init" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_libnetapi_init" >&6; }
+- if test $ac_cv_lib_ext_netapi_libnetapi_init = yes; then
++ if test $ac_cv_lib_ext_netapi_libnetapi_init = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI_INIT 1
+ _ACEOF
+
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -101453,24 +45152,17 @@
+ fi
+
+
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS $LIBS"
+
+
+
+-
+- { $as_echo "$as_me:$LINENO: checking for NetUserModalsGet in -lnetapi" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserModalsGet in -lnetapi" >&5
+ $as_echo_n "checking for NetUserModalsGet in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserModalsGet+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserModalsGet+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -101488,54 +45180,28 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_netapi_NetUserModalsGet=yes;
+ ac_cv_lib_ext_netapi=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ext_netapi_NetUserModalsGet=no;
++ ac_cv_lib_ext_netapi_NetUserModalsGet=no;
+ ac_cv_lib_ext_netapi=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserModalsGet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserModalsGet" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserModalsGet" >&6; }
+- if test $ac_cv_lib_ext_netapi_NetUserModalsGet = yes; then
++ if test $ac_cv_lib_ext_netapi_NetUserModalsGet = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERMODALSGET 1
+ _ACEOF
+
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -101552,24 +45218,17 @@
+ fi
+
+
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS $LIBS"
+
+
+
+-
+- { $as_echo "$as_me:$LINENO: checking for NetUserGetGroups in -lnetapi" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserGetGroups in -lnetapi" >&5
+ $as_echo_n "checking for NetUserGetGroups in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserGetGroups+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserGetGroups+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -101587,54 +45246,28 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_netapi_NetUserGetGroups=yes;
+ ac_cv_lib_ext_netapi=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ext_netapi_NetUserGetGroups=no;
++ ac_cv_lib_ext_netapi_NetUserGetGroups=no;
+ ac_cv_lib_ext_netapi=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserGetGroups" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserGetGroups" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserGetGroups" >&6; }
+- if test $ac_cv_lib_ext_netapi_NetUserGetGroups = yes; then
++ if test $ac_cv_lib_ext_netapi_NetUserGetGroups = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERGETGROUPS 1
+ _ACEOF
+
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -101651,24 +45284,17 @@
+ fi
+
+
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS $LIBS"
+
+
+
+-
+- { $as_echo "$as_me:$LINENO: checking for NetUserGetInfo in -lnetapi" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserGetInfo in -lnetapi" >&5
+ $as_echo_n "checking for NetUserGetInfo in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserGetInfo+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserGetInfo+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -101686,54 +45312,28 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_netapi_NetUserGetInfo=yes;
+ ac_cv_lib_ext_netapi=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ext_netapi_NetUserGetInfo=no;
++ ac_cv_lib_ext_netapi_NetUserGetInfo=no;
+ ac_cv_lib_ext_netapi=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserGetInfo" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserGetInfo" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserGetInfo" >&6; }
+- if test $ac_cv_lib_ext_netapi_NetUserGetInfo = yes; then
++ if test $ac_cv_lib_ext_netapi_NetUserGetInfo = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERGETINFO 1
+ _ACEOF
+
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -101750,24 +45350,17 @@
+ fi
+
+
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS $LIBS"
+
+
+
+-
+- { $as_echo "$as_me:$LINENO: checking for NetUserSetInfo in -lnetapi" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserSetInfo in -lnetapi" >&5
+ $as_echo_n "checking for NetUserSetInfo in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserSetInfo+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserSetInfo+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -101785,54 +45378,28 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_netapi_NetUserSetInfo=yes;
+ ac_cv_lib_ext_netapi=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ext_netapi_NetUserSetInfo=no;
++ ac_cv_lib_ext_netapi_NetUserSetInfo=no;
+ ac_cv_lib_ext_netapi=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserSetInfo" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserSetInfo" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserSetInfo" >&6; }
+- if test $ac_cv_lib_ext_netapi_NetUserSetInfo = yes; then
++ if test $ac_cv_lib_ext_netapi_NetUserSetInfo = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERSETINFO 1
+ _ACEOF
+
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -101847,12 +45414,9 @@
+
+
+ fi
+-
+ if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserModalsGet" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetGroups" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetInfo" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserSetInfo" = x"yes";then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_LIBNETAPI 1
+-_ACEOF
++$as_echo "#define ENABLE_LIBNETAPI 1" >>confdefs.h
+
+
+ MAKE_SETTINGS="$MAKE_SETTINGS
+@@ -101870,9 +45434,7 @@
+
+ else
+ if test x$use_netapi != xauto; then
+- { { $as_echo "$as_me:$LINENO: error: --enable-netapi: libnetapi not found" >&5
+-$as_echo "$as_me: error: --enable-netapi: libnetapi not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "--enable-netapi: libnetapi not found" "$LINENO" 5
+ fi
+ fi
+
+@@ -101913,19 +45475,17 @@
+
#################################################
# check for pthread support
-{ $as_echo "$as_me:$LINENO: checking whether to use pthreads" >&5
@@ -102442,7 +106076,7 @@
fi
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -97690,12 +43468,12 @@
+@@ -101943,12 +45503,12 @@
;;
*)
@@ -102457,7 +106091,7 @@
$as_echo "no" >&6; }
fi
-@@ -97711,274 +43489,45 @@
+@@ -101964,274 +45524,45 @@
@@ -102745,7 +106379,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97996,54 +43545,28 @@
+@@ -102249,54 +45580,28 @@
return 0;
}
_ACEOF
@@ -102807,7 +106441,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSETPROCTITLE 1
_ACEOF
-@@ -98059,15 +43582,14 @@
+@@ -102312,15 +45617,14 @@
fi
@@ -102825,8 +106459,8 @@
$as_echo "yes" >&6; }
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98077,22 +43599,20 @@
- \$enabled{SETPROCTITLE} = \"YES\";"
+@@ -102330,22 +45634,20 @@
+ \$enabled{\"SETPROCTITLE\"} = \"YES\";"
-cat >>confdefs.h <<\_ACEOF
@@ -102852,7 +106486,7 @@
$as_echo "no" >&6; }
fi
-@@ -98110,17 +43630,13 @@
+@@ -102363,238 +45665,68 @@
@@ -102873,10 +106507,21 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -98139,209 +43655,43 @@
- return 0;
- }
- _ACEOF
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-int
+-main ()
+-{
+-struct stat st;
+- st.st_mtim.tv_nsec;
+- st.st_atim.tv_nsec;
+- st.st_ctim.tv_nsec;
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -102895,33 +106540,29 @@
- 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_decl_have_stat_tv_nsec=yes
- else
+- ac_cv_decl_have_stat_tv_nsec=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_decl_have_stat_tv_nsec=no
-+ ac_cv_decl_have_stat_tv_nsec=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_stat_tv_nsec" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_stat_tv_nsec" >&5
- $as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
- if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then
-
+-$as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
+-if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT_TV_NSEC 1
-_ACEOF
-+$as_echo "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h
-
- fi
-
-
- for ac_header in blkid/blkid.h
+-fi
+-
+-
+-for ac_header in blkid/blkid.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -102976,7 +106617,14 @@
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++int
++main ()
++{
++struct stat st;
++ st.st_mtim.tv_nsec;
++ st.st_atim.tv_nsec;
++ st.st_ctim.tv_nsec;
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -102987,7 +106635,10 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++ ;
++ return 0;
++}
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -103006,17 +106657,26 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_decl_have_stat_tv_nsec=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_decl_have_stat_tv_nsec=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
- ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_stat_tv_nsec" >&5
++$as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
++if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++$as_echo "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -103053,16 +106713,17 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++for ac_header in blkid/blkid.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "blkid/blkid.h" "ac_cv_header_blkid_blkid_h" "$ac_includes_default"
+if test "x$ac_cv_header_blkid_blkid_h" = x""yes; then :
@@ -103094,7 +106755,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98359,46 +43709,15 @@
+@@ -102612,46 +45744,15 @@
return 0;
}
_ACEOF
@@ -103145,15 +106806,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98411,70 +43730,37 @@
- int
- main ()
- {
--return blkid_get_cache ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -102669,65 +45770,32 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -103175,11 +106831,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+return blkid_get_cache ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_ext_blkid_get_cache="-l$ac_lib"
break
@@ -103229,7 +106880,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. */
-@@ -98515,50 +43801,24 @@
+@@ -102768,50 +45836,24 @@
return 0;
}
_ACEOF
@@ -103286,7 +106937,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
BLKID_LIBS = ${BLKID_LIBS}
BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -98569,9 +43829,7 @@
+@@ -102822,9 +45864,7 @@
if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
@@ -103297,7 +106948,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98599,102 +43857,12 @@
+@@ -102852,102 +45892,12 @@
fi
@@ -103404,7 +107055,7 @@
_ACEOF
fi
-@@ -98704,151 +43872,12 @@
+@@ -102957,151 +45907,12 @@
###############################
# start SMB_EXT_LIB_PAM
# check for security/pam_appl.h and -lpam
@@ -103560,7 +107211,7 @@
_ACEOF
fi
-@@ -98857,23 +43886,17 @@
+@@ -103110,23 +45921,17 @@
@@ -103587,7 +107238,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98891,54 +43914,28 @@
+@@ -103144,54 +45949,28 @@
return 0;
}
_ACEOF
@@ -103649,7 +107300,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -98953,7 +43950,6 @@
+@@ -103206,7 +45985,6 @@
fi
@@ -103657,7 +107308,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
-@@ -98979,23 +43975,17 @@
+@@ -103232,23 +46010,17 @@
# test for where we get crypt() from
@@ -103684,7 +107335,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -99013,54 +44003,28 @@
+@@ -103266,54 +46038,28 @@
return 0;
}
_ACEOF
@@ -103746,7 +107397,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
-@@ -99076,7 +44040,6 @@
+@@ -103329,7 +46075,6 @@
fi
@@ -103754,7 +107405,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
CRYPT_ENABLE = YES
"
-@@ -99093,102 +44056,12 @@
+@@ -103346,102 +46091,12 @@
@@ -103862,7 +107513,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -99197,151 +44070,12 @@
+@@ -103450,151 +46105,12 @@
done
@@ -104018,7 +107669,7 @@
_ACEOF
fi
-@@ -99350,330 +44084,18 @@
+@@ -103603,23 +46119,17 @@
@@ -104030,32 +107681,25 @@
-
- { $as_echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
--$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
+ $as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
-if test "${ac_cv_lib_ext_sasl2_sasl_client_init+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_lib_ext_sasl2_sasl_client_init+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* 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 sasl_client_init ();
--int
--main ()
--{
--return sasl_client_init ();
-- ;
-- return 0;
--}
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -103637,54 +46147,28 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -104077,74 +107721,89 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ext_sasl2_sasl_client_init=yes;
-- ac_cv_lib_ext_sasl2=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_sasl2_sasl_client_init=yes;
+ ac_cv_lib_ext_sasl2=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ext_sasl2_sasl_client_init=no;
-- ac_cv_lib_ext_sasl2=no
--fi
++ ac_cv_lib_ext_sasl2_sasl_client_init=no;
+ ac_cv_lib_ext_sasl2=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_sasl2_sasl_client_init" >&5
--$as_echo "$ac_cv_lib_ext_sasl2_sasl_client_init" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_sasl2_sasl_client_init" >&5
+ $as_echo "$ac_cv_lib_ext_sasl2_sasl_client_init" >&6; }
- if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_SASL_CLIENT_INIT 1
--_ACEOF
++ if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SASL_CLIENT_INIT 1
+ _ACEOF
+
+ fi
-
--fi
--
--LIBS=$ac_check_lib_ext_save_LIBS
--
+ LIBS=$ac_check_lib_ext_save_LIBS
+
-if test $ac_cv_lib_ext_sasl2 = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBSASL2 1
--_ACEOF
++if test $ac_cv_lib_ext_sasl2 = yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSASL2 1
+ _ACEOF
+@@ -103700,7 +46184,6 @@
+
+ fi
+
-
-- case "$SASL_LIBS" in
-- *-lsasl2*)
-- ;;
-- *)
-- SASL_LIBS="-lsasl2 $SASL_LIBS"
-- ;;
-- esac
+ if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
+
+ MAKE_SETTINGS="$MAKE_SETTINGS
+@@ -103746,312 +46229,88 @@
+ ac_new_flags="$ac_new_flags$s$i";
+ else
+ ac_new_flags="$ac_new_flags$s$l $i";
+- fi
+- l=""
+- ;;
+- esac
+- done
+- SASL_LDFLAGS=$ac_new_flags
-
-
--fi
+- ac_new_flags=""
+- for i in $SASL_CPPFLAGS; do
+- case $i in
+- -I/usr/include|-I/usr/include/) ;;
+- *) ac_new_flags="$ac_new_flags $i" ;;
+- esac
+- done
+- SASL_CPPFLAGS=$ac_new_flags
-
-
--if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
+- ac_new_flags=""
+- for i in $SASL_CFLAGS; do
+- case $i in
+- -I/usr/include|-I/usr/include/) ;;
+- *) ac_new_flags="$ac_new_flags $i" ;;
+- esac
+- done
+- SASL_CFLAGS=$ac_new_flags
-
-- MAKE_SETTINGS="$MAKE_SETTINGS
--SASL_ENABLE = YES
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{SASL} = \"YES\";"
--
--
-- MAKE_SETTINGS="$MAKE_SETTINGS
--cyrus_sasl_ENABLE = YES
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{cyrus_sasl} = \"YES\";"
--
-- SASL_CFLAGS="$CFLAGS"
-- SASL_CPPFLAGS="$CPPFLAGS"
-- SASL_LDFLAGS="$LDFLAGS"
-else
-
- MAKE_SETTINGS="$MAKE_SETTINGS
-cyrus_sasl_ENABLE = NO
-"
-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{cyrus_sasl} = \"NO\";"
+-\$enabled{\"cyrus_sasl\"} = \"NO\";"
-
-fi
-
@@ -104163,7 +107822,7 @@
-server_service_kdc_ENABLE = $HAVE_KRB5
-"
-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{server_service_kdc} = \"$HAVE_KRB5\";"
+-\$enabled{\"server_service_kdc\"} = \"$HAVE_KRB5\";"
-
-
-
@@ -104257,14 +107916,38 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ fi
++ l=""
++ ;;
++ esac
++ done
++ SASL_LDFLAGS=$ac_new_flags
+
- ac_header_preproc=no
-fi
--
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++ ac_new_flags=""
++ for i in $SASL_CPPFLAGS; do
++ case $i in
++ -I/usr/include|-I/usr/include/) ;;
++ *) ac_new_flags="$ac_new_flags $i" ;;
++ esac
++ done
++ SASL_CPPFLAGS=$ac_new_flags
++
++
++ ac_new_flags=""
++ for i in $SASL_CFLAGS; do
++ case $i in
++ -I/usr/include|-I/usr/include/) ;;
++ *) ac_new_flags="$ac_new_flags $i" ;;
++ esac
++ done
++ SASL_CFLAGS=$ac_new_flags
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -104299,14 +107982,14 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -104314,49 +107997,56 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
--
--fi
--
++ MAKE_SETTINGS="$MAKE_SETTINGS
++cyrus_sasl_ENABLE = NO
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"cyrus_sasl\"} = \"NO\";"
+
+ fi
+
-done
--
+
-{ $as_echo "$as_me:$LINENO: checking for inotify_init" >&5
-$as_echo_n "checking for inotify_init... " >&6; }
-if test "${ac_cv_func_inotify_init+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
-+$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
-+if test "${ac_cv_lib_ext_sasl2_sasl_client_init+set}" = set; then :
- $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 inotify_init to an innocuous variant, in case <limits.h> declares inotify_init.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define inotify_init innocuous_inotify_init
--
++MAKE_SETTINGS="$MAKE_SETTINGS
++SASL_LIBS = $SASL_LIBS
++SASL_CFLAGS = ${SASL_CFLAGS}
++SASL_CPPFLAGS = ${SASL_CPPFLAGS}
++SASL_LDFLAGS = ${SASL_LDFLAGS}
++"
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char inotify_init (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
+
-#undef inotify_init
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -99681,70 +44103,125 @@
- #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 inotify_init ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -104364,16 +108054,28 @@
-#if defined __stub_inotify_init || defined __stub___inotify_init
-choke me
-#endif
--
-+char sasl_client_init ();
- int
- main ()
- {
++ MAKE_SETTINGS="$MAKE_SETTINGS
++server_service_kdc_ENABLE = $HAVE_KRB5
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"server_service_kdc\"} = \"$HAVE_KRB5\";"
+
+-int
+-main ()
+-{
-return inotify_init ();
-+return sasl_client_init ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++
++for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -104397,100 +108099,9 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_inotify_init=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_sasl2_sasl_client_init=yes;
-+ ac_cv_lib_ext_sasl2=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_ext_sasl2_sasl_client_init=no;
-+ ac_cv_lib_ext_sasl2=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_sasl2_sasl_client_init" >&5
-+$as_echo "$ac_cv_lib_ext_sasl2_sasl_client_init" >&6; }
-+ if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SASL_CLIENT_INIT 1
-+_ACEOF
-+
-+fi
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_sasl2 = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSASL2 1
-+_ACEOF
-+
-+ case "$SASL_LIBS" in
-+ *-lsasl2*)
-+ ;;
-+ *)
-+ SASL_LIBS="-lsasl2 $SASL_LIBS"
-+ ;;
-+ esac
-+
-+
-+fi
-+
-+if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
-+
-+ MAKE_SETTINGS="$MAKE_SETTINGS
-+SASL_ENABLE = YES
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{SASL} = \"YES\";"
-+
-+
-+ MAKE_SETTINGS="$MAKE_SETTINGS
-+cyrus_sasl_ENABLE = YES
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{cyrus_sasl} = \"YES\";"
-+
-+ SASL_CFLAGS="$CFLAGS"
-+ SASL_CPPFLAGS="$CPPFLAGS"
-+ SASL_LDFLAGS="$LDFLAGS"
-+else
-+
-+ MAKE_SETTINGS="$MAKE_SETTINGS
-+cyrus_sasl_ENABLE = NO
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{cyrus_sasl} = \"NO\";"
-+
-+fi
-+
-+
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+SASL_LIBS = $SASL_LIBS
-+SASL_CFLAGS = ${SASL_CFLAGS}
-+SASL_CPPFLAGS = ${SASL_CPPFLAGS}
-+SASL_LDFLAGS = ${SASL_LDFLAGS}
-+"
-+
-+
-+
-+
-+ MAKE_SETTINGS="$MAKE_SETTINGS
-+server_service_kdc_ENABLE = $HAVE_KRB5
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{server_service_kdc} = \"$HAVE_KRB5\";"
-+
-+
-+for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+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_func_inotify_init=no
fi
@@ -104525,7 +108136,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -99755,41 +44232,18 @@
+@@ -104062,41 +46321,18 @@
return 0;
}
_ACEOF
@@ -104571,7 +108182,7 @@
fi
-@@ -99833,17 +44287,13 @@
+@@ -104140,17 +46376,13 @@
fi
@@ -104592,7 +108203,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -99854,56 +44304,29 @@
+@@ -104161,56 +46393,29 @@
return 0;
}
_ACEOF
@@ -104656,7 +108267,7 @@
/* end confdefs.h. */
#include <signal.h>
int
-@@ -99914,41 +44337,18 @@
+@@ -104221,41 +46426,18 @@
return 0;
}
_ACEOF
@@ -104702,7 +108313,7 @@
fi
-@@ -99972,151 +44372,12 @@
+@@ -104279,151 +46461,12 @@
fi
@@ -104859,7 +108470,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -100430,151 +44691,12 @@
+@@ -104737,151 +46780,12 @@
@@ -105015,7 +108626,7 @@
_ACEOF
fi
-@@ -100584,23 +44706,17 @@
+@@ -104891,23 +46795,17 @@
@@ -105042,7 +108653,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -100618,54 +44734,28 @@
+@@ -104925,54 +46823,28 @@
return 0;
}
_ACEOF
@@ -105104,7 +108715,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -100681,18 +44771,13 @@
+@@ -104988,18 +46860,13 @@
fi
@@ -105126,7 +108737,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -100710,40 +44795,19 @@
+@@ -105017,40 +46884,19 @@
return 0;
}
_ACEOF
@@ -105169,7 +108780,33 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -100857,87 +44921,54 @@
+@@ -105072,7 +46918,7 @@
+
+
+ # Check whether --enable-dmalloc was given.
+-if test "${enable_dmalloc+set}" = set; then
++if test "${enable_dmalloc+set}" = set; then :
+ enableval=$enable_dmalloc;
+ fi
+
+@@ -105080,14 +46926,10 @@
+ if test "x$enable_dmalloc" = xyes
+ then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_DMALLOC 1
+-_ACEOF
++$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define DMALLOC_FUNC_CHECK 1
+-_ACEOF
++$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
+
+ LIBS="$LIBS -ldmalloc"
+ fi
+@@ -105185,87 +47027,54 @@
#################################################
# Display summary of libraries detected
@@ -105273,7 +108910,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
-@@ -100996,13 +45027,13 @@
+@@ -105324,13 +47133,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -105289,7 +108926,7 @@
esac ;;
esac
done
-@@ -101010,8 +45041,8 @@
+@@ -105338,8 +47147,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -105300,7 +108937,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -101034,11 +45065,11 @@
+@@ -105362,11 +47171,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" &&
@@ -105314,7 +108951,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -101058,8 +45089,8 @@
+@@ -105386,8 +47195,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.
@@ -105325,7 +108962,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -101083,9 +45114,10 @@
+@@ -105411,9 +47220,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -105338,7 +108975,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -101095,17 +45127,18 @@
+@@ -105423,17 +47233,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -105364,7 +109001,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -101113,23 +45146,15 @@
+@@ -105441,23 +47252,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -105393,7 +109030,7 @@
as_nl='
'
export as_nl
-@@ -101137,7 +45162,13 @@
+@@ -105465,7 +47268,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
@@ -105408,7 +109045,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -101148,7 +45179,7 @@
+@@ -105476,7 +47285,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -105417,7 +109054,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -101171,13 +45202,6 @@
+@@ -105499,13 +47308,6 @@
}
fi
@@ -105431,7 +109068,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -101187,15 +45211,15 @@
+@@ -105515,15 +47317,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -105450,7 +109087,7 @@
IFS=$as_save_IFS
;;
-@@ -101207,12 +45231,16 @@
+@@ -105535,12 +47337,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -105471,7 +109108,7 @@
done
PS1='$ '
PS2='> '
-@@ -101224,7 +45252,89 @@
+@@ -105552,7 +47358,89 @@
LANGUAGE=C
export LANGUAGE
@@ -105562,7 +109199,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -101238,8 +45348,12 @@
+@@ -105566,8 +47454,12 @@
as_basename=false
fi
@@ -105576,7 +109213,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -101259,76 +45373,25 @@
+@@ -105587,76 +47479,25 @@
}
s/.*/./; q'`
@@ -105664,7 +109301,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -101357,8 +45420,56 @@
+@@ -105685,8 +47526,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -105722,7 +109359,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -101377,10 +45488,10 @@
+@@ -105705,10 +47594,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -105735,7 +109372,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -101395,13 +45506,19 @@
+@@ -105723,13 +47612,19 @@
exec 6>&1
@@ -105753,11 +109390,11 @@
ac_log="
This file was extended by Samba $as_me 3, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -101433,10 +45550,11 @@
+@@ -105761,13 +47656,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -105772,7 +109409,11 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -101458,16 +45576,16 @@
++ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+@@ -105786,16 +47683,17 @@
Configuration commands:
$config_commands
@@ -105781,18 +109422,29 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Samba config.status 3
-configured by $0, generated by GNU Autoconf 2.63,
-+configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -101509,20 +45627,19 @@
+@@ -105830,6 +47728,8 @@
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+@@ -105837,20 +47737,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -105817,7 +109469,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -101530,11 +45647,10 @@
+@@ -105858,11 +47757,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -105832,7 +109484,7 @@
ac_need_defaults=false ;;
esac
-@@ -101627,9 +45743,7 @@
+@@ -105955,9 +47853,7 @@
"pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
"../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
@@ -105843,7 +109495,7 @@
esac
done
-@@ -101656,7 +45770,7 @@
+@@ -105984,7 +47880,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -105852,7 +109504,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -101667,11 +45781,7 @@
+@@ -105995,11 +47891,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -105865,7 +109517,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -101679,10 +45789,16 @@
+@@ -106007,10 +47899,16 @@
if test -n "$CONFIG_FILES"; then
@@ -105885,7 +109537,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -101696,24 +45812,18 @@
+@@ -106024,24 +47922,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -105913,7 +109565,25 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -101802,9 +45912,7 @@
+@@ -106063,7 +47955,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -106077,7 +47969,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -106130,9 +48022,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -105924,7 +109594,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -101845,9 +45953,7 @@
+@@ -106173,9 +48063,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -105935,7 +109605,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -101932,9 +46038,7 @@
+@@ -106260,9 +48148,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -105946,7 +109616,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -101947,9 +46051,7 @@
+@@ -106275,9 +48161,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -105957,7 +109627,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -101977,12 +46079,10 @@
+@@ -106305,12 +48189,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -105972,7 +109642,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -101993,7 +46093,7 @@
+@@ -106321,7 +48203,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -105981,7 +109651,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -102006,9 +46106,7 @@
+@@ -106334,9 +48216,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -105992,7 +109662,7 @@
esac
;;
esac
-@@ -102036,47 +46134,7 @@
+@@ -106364,47 +48244,7 @@
q
}
s/.*/./; q'`
@@ -106041,7 +109711,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -102128,7 +46186,6 @@
+@@ -106456,7 +48296,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=
@@ -106049,7 +109719,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -102138,12 +46195,11 @@
+@@ -106466,12 +48305,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -106064,7 +109734,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
-@@ -102153,7 +46209,7 @@
+@@ -106481,7 +48319,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -106073,7 +109743,7 @@
esac
_ACEOF
-@@ -102181,14 +46237,12 @@
+@@ -106509,14 +48347,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -106090,7 +109760,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;}
-@@ -102198,9 +46252,7 @@
+@@ -106526,9 +48362,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -106101,7 +109771,7 @@
;;
:H)
#
-@@ -102211,29 +46263,23 @@
+@@ -106539,29 +48373,23 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -106136,7 +109806,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -102259,15 +46305,12 @@
+@@ -106587,15 +48415,12 @@
done # for ac_tag
@@ -106154,7 +109824,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -102288,10 +46331,10 @@
+@@ -106616,10 +48441,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.
@@ -106167,7 +109837,7 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -102302,8 +46345,8 @@
+@@ -106630,8 +48455,8 @@
# Print very concise instructions on building/use
if test "x$enable_dmalloc" = xyes
then
Modified: branches/samba/experimental/debian/patches/codepages-location.patch
===================================================================
--- branches/samba/experimental/debian/patches/codepages-location.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/codepages-location.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -4,11 +4,11 @@
Bug: https://bugzilla.samba.org/show_bug.cgi?id=6444
Forwarded: yes
-Index: b/source3/Makefile.in
+Index: experimental/source3/Makefile.in
===================================================================
---- a/source3/Makefile.in 2009-11-08 15:55:34.000000000 +0100
-+++ b/source3/Makefile.in 2009-11-08 15:55:38.000000000 +0100
-@@ -156,7 +156,7 @@
+--- experimental.orig/source3/Makefile.in
++++ experimental/source3/Makefile.in
+@@ -167,7 +167,7 @@
STATEDIR = @statedir@
# Where to look for (and install) codepage databases.
Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/documentation.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -2,10 +2,10 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: b/docs/manpages/swat.8
+Index: experimental/docs/manpages/swat.8
===================================================================
---- a/docs/manpages/swat.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/swat.8 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/docs/manpages/swat.8
++++ experimental/docs/manpages/swat.8
@@ -261,85 +261,6 @@
.RS 4
Print a summary of command line options\&.
@@ -109,10 +109,10 @@
.RE
.SH "WARNINGS"
.PP
-Index: b/docs/manpages/nmbd.8
+Index: experimental/docs/manpages/nmbd.8
===================================================================
---- a/docs/manpages/nmbd.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/nmbd.8 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/docs/manpages/nmbd.8
++++ experimental/docs/manpages/nmbd.8
@@ -265,10 +265,7 @@
to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
\fIONLY\fR\&.
@@ -155,10 +155,10 @@
\FCnmbd\F[]
to dump out its server database in the
\FClog\&.nmb\F[]
-Index: b/docs/manpages/smbd.8
+Index: experimental/docs/manpages/smbd.8
===================================================================
---- a/docs/manpages/smbd.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/smbd.8 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/docs/manpages/smbd.8
++++ experimental/docs/manpages/smbd.8
@@ -319,14 +319,11 @@
\FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
@@ -176,10 +176,10 @@
.sp
This file describes all the services the server is to make available to clients\&. See
\fBsmb.conf\fR(5)
-Index: b/docs/manpages/lmhosts.5
+Index: experimental/docs/manpages/lmhosts.5
===================================================================
---- a/docs/manpages/lmhosts.5 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/lmhosts.5 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/docs/manpages/lmhosts.5
++++ experimental/docs/manpages/lmhosts.5
@@ -257,10 +257,8 @@
file\&.
.SH "FILES"
@@ -193,10 +193,10 @@
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: b/docs/manpages/ntlm_auth.1
+Index: experimental/docs/manpages/ntlm_auth.1
===================================================================
---- a/docs/manpages/ntlm_auth.1 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/ntlm_auth.1 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/docs/manpages/ntlm_auth.1
++++ experimental/docs/manpages/ntlm_auth.1
@@ -193,7 +193,7 @@
Some of these commands also require access to the directory
\FCwinbindd_privileged\F[]
@@ -224,10 +224,10 @@
.RE
.PP
gss\-spnego\-client
-Index: b/docs/manpages/tdbbackup.8
+Index: experimental/docs/manpages/tdbbackup.8
===================================================================
---- a/docs/manpages/tdbbackup.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/tdbbackup.8 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/docs/manpages/tdbbackup.8
++++ experimental/docs/manpages/tdbbackup.8
@@ -227,7 +227,7 @@
.\}
@@ -255,10 +255,10 @@
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: b/docs/manpages/winbindd.8
+Index: experimental/docs/manpages/winbindd.8
===================================================================
---- a/docs/manpages/winbindd.8 2009-11-08 15:54:28.000000000 +0100
-+++ b/docs/manpages/winbindd.8 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/docs/manpages/winbindd.8
++++ experimental/docs/manpages/winbindd.8
@@ -771,16 +771,16 @@
file are owned by root\&.
.RE
Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -13,11 +13,11 @@
Forwarded: not-needed
-Index: b/source3/passdb/pdb_tdb.c
+Index: experimental/source3/passdb/pdb_tdb.c
===================================================================
---- a/source3/passdb/pdb_tdb.c 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/passdb/pdb_tdb.c 2009-11-08 15:55:33.000000000 +0100
-@@ -1252,7 +1252,7 @@
+--- experimental.orig/source3/passdb/pdb_tdb.c
++++ experimental/source3/passdb/pdb_tdb.c
+@@ -1255,7 +1255,7 @@
/* save the path for later */
if (!location) {
@@ -26,11 +26,11 @@
PASSDB_FILE_NAME) < 0) {
return NT_STATUS_NO_MEMORY;
}
-Index: b/source3/passdb/secrets.c
+Index: experimental/source3/passdb/secrets.c
===================================================================
---- a/source3/passdb/secrets.c 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/passdb/secrets.c 2009-11-08 15:55:33.000000000 +0100
-@@ -59,7 +59,7 @@
+--- experimental.orig/source3/passdb/secrets.c
++++ experimental/source3/passdb/secrets.c
+@@ -61,7 +61,7 @@
return True;
fname = talloc_asprintf(talloc_tos(), "%s/secrets.tdb",
@@ -39,12 +39,3 @@
if (fname == NULL) {
return false;
}
-@@ -1138,7 +1138,7 @@
- TDB_DATA vers;
- uint32 ver;
- TDB_CONTEXT *tdb_sc = NULL;
-- char *fname = talloc_asprintf(mem_ctx, "%s/schannel_store.tdb", lp_private_dir());
-+ char *fname = talloc_asprintf(mem_ctx, "%s/schannel_store.tdb", get_dyn_STATEDIR());
-
- if (!fname) {
- return NULL;
Modified: branches/samba/experimental/debian/patches/fix-manpages-warnings.patch
===================================================================
--- branches/samba/experimental/debian/patches/fix-manpages-warnings.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/fix-manpages-warnings.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -2,10 +2,10 @@
Lintian report non-existing macros in manpages.
Author: Christian Perrier <bubulle at debian.org>
-Index: b/docs/manpages/cifs.upcall.8
+Index: experimental/docs/manpages/cifs.upcall.8
===================================================================
---- a/docs/manpages/cifs.upcall.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/cifs.upcall.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/cifs.upcall.8
++++ experimental/docs/manpages/cifs.upcall.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -30,10 +30,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/eventlogadm.8
+Index: experimental/docs/manpages/eventlogadm.8
===================================================================
---- a/docs/manpages/eventlogadm.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/eventlogadm.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/eventlogadm.8
++++ experimental/docs/manpages/eventlogadm.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -58,10 +58,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/findsmb.1
+Index: experimental/docs/manpages/findsmb.1
===================================================================
---- a/docs/manpages/findsmb.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/findsmb.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/findsmb.1
++++ experimental/docs/manpages/findsmb.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -86,10 +86,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_ad.8
+Index: experimental/docs/manpages/idmap_ad.8
===================================================================
---- a/docs/manpages/idmap_ad.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_ad.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_ad.8
++++ experimental/docs/manpages/idmap_ad.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -114,10 +114,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_adex.8
+Index: experimental/docs/manpages/idmap_adex.8
===================================================================
---- a/docs/manpages/idmap_adex.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_adex.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_adex.8
++++ experimental/docs/manpages/idmap_adex.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -142,10 +142,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_hash.8
+Index: experimental/docs/manpages/idmap_hash.8
===================================================================
---- a/docs/manpages/idmap_hash.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_hash.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_hash.8
++++ experimental/docs/manpages/idmap_hash.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -170,10 +170,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_ldap.8
+Index: experimental/docs/manpages/idmap_ldap.8
===================================================================
---- a/docs/manpages/idmap_ldap.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_ldap.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_ldap.8
++++ experimental/docs/manpages/idmap_ldap.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -198,10 +198,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_nss.8
+Index: experimental/docs/manpages/idmap_nss.8
===================================================================
---- a/docs/manpages/idmap_nss.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_nss.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_nss.8
++++ experimental/docs/manpages/idmap_nss.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -226,10 +226,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_rid.8
+Index: experimental/docs/manpages/idmap_rid.8
===================================================================
---- a/docs/manpages/idmap_rid.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_rid.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_rid.8
++++ experimental/docs/manpages/idmap_rid.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -254,10 +254,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_tdb.8
+Index: experimental/docs/manpages/idmap_tdb.8
===================================================================
---- a/docs/manpages/idmap_tdb.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_tdb.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_tdb.8
++++ experimental/docs/manpages/idmap_tdb.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -282,10 +282,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/idmap_tdb2.8
+Index: experimental/docs/manpages/idmap_tdb2.8
===================================================================
---- a/docs/manpages/idmap_tdb2.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/idmap_tdb2.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/idmap_tdb2.8
++++ experimental/docs/manpages/idmap_tdb2.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -310,10 +310,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/ldb.3
+Index: experimental/docs/manpages/ldb.3
===================================================================
---- a/docs/manpages/ldb.3 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/ldb.3 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/ldb.3
++++ experimental/docs/manpages/ldb.3
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -338,10 +338,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/ldbadd.1
+Index: experimental/docs/manpages/ldbadd.1
===================================================================
---- a/docs/manpages/ldbadd.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/ldbadd.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/ldbadd.1
++++ experimental/docs/manpages/ldbadd.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -366,10 +366,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/ldbdel.1
+Index: experimental/docs/manpages/ldbdel.1
===================================================================
---- a/docs/manpages/ldbdel.1 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/ldbdel.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/ldbdel.1
++++ experimental/docs/manpages/ldbdel.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -394,10 +394,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/ldbedit.1
+Index: experimental/docs/manpages/ldbedit.1
===================================================================
---- a/docs/manpages/ldbedit.1 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/ldbedit.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/ldbedit.1
++++ experimental/docs/manpages/ldbedit.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -422,10 +422,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/ldbmodify.1
+Index: experimental/docs/manpages/ldbmodify.1
===================================================================
---- a/docs/manpages/ldbmodify.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/ldbmodify.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/ldbmodify.1
++++ experimental/docs/manpages/ldbmodify.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -450,10 +450,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/ldbsearch.1
+Index: experimental/docs/manpages/ldbsearch.1
===================================================================
---- a/docs/manpages/ldbsearch.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/ldbsearch.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/ldbsearch.1
++++ experimental/docs/manpages/ldbsearch.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -478,10 +478,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/libsmbclient.7
+Index: experimental/docs/manpages/libsmbclient.7
===================================================================
---- a/docs/manpages/libsmbclient.7 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/libsmbclient.7 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/libsmbclient.7
++++ experimental/docs/manpages/libsmbclient.7
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -506,10 +506,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/lmhosts.5
+Index: experimental/docs/manpages/lmhosts.5
===================================================================
---- a/docs/manpages/lmhosts.5 2009-11-08 15:55:33.000000000 +0100
-+++ b/docs/manpages/lmhosts.5 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/lmhosts.5
++++ experimental/docs/manpages/lmhosts.5
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -534,10 +534,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/log2pcap.1
+Index: experimental/docs/manpages/log2pcap.1
===================================================================
---- a/docs/manpages/log2pcap.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/log2pcap.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/log2pcap.1
++++ experimental/docs/manpages/log2pcap.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -562,10 +562,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/mount.cifs.8
+Index: experimental/docs/manpages/mount.cifs.8
===================================================================
---- a/docs/manpages/mount.cifs.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/mount.cifs.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/mount.cifs.8
++++ experimental/docs/manpages/mount.cifs.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -590,10 +590,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/net.8
+Index: experimental/docs/manpages/net.8
===================================================================
---- a/docs/manpages/net.8 2009-11-08 15:55:35.000000000 +0100
-+++ b/docs/manpages/net.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/net.8
++++ experimental/docs/manpages/net.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -618,10 +618,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/nmbd.8
+Index: experimental/docs/manpages/nmbd.8
===================================================================
---- a/docs/manpages/nmbd.8 2009-11-08 15:55:33.000000000 +0100
-+++ b/docs/manpages/nmbd.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/nmbd.8
++++ experimental/docs/manpages/nmbd.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -646,10 +646,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/nmblookup.1
+Index: experimental/docs/manpages/nmblookup.1
===================================================================
---- a/docs/manpages/nmblookup.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/nmblookup.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/nmblookup.1
++++ experimental/docs/manpages/nmblookup.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -674,10 +674,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/ntlm_auth.1
+Index: experimental/docs/manpages/ntlm_auth.1
===================================================================
---- a/docs/manpages/ntlm_auth.1 2009-11-08 15:55:33.000000000 +0100
-+++ b/docs/manpages/ntlm_auth.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/ntlm_auth.1
++++ experimental/docs/manpages/ntlm_auth.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -702,10 +702,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/pam_winbind.8
+Index: experimental/docs/manpages/pam_winbind.8
===================================================================
---- a/docs/manpages/pam_winbind.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/pam_winbind.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/pam_winbind.8
++++ experimental/docs/manpages/pam_winbind.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -730,10 +730,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/pdbedit.8
+Index: experimental/docs/manpages/pdbedit.8
===================================================================
---- a/docs/manpages/pdbedit.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/pdbedit.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/pdbedit.8
++++ experimental/docs/manpages/pdbedit.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -758,10 +758,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/profiles.1
+Index: experimental/docs/manpages/profiles.1
===================================================================
---- a/docs/manpages/profiles.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/profiles.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/profiles.1
++++ experimental/docs/manpages/profiles.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -786,10 +786,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/rpcclient.1
+Index: experimental/docs/manpages/rpcclient.1
===================================================================
---- a/docs/manpages/rpcclient.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/rpcclient.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/rpcclient.1
++++ experimental/docs/manpages/rpcclient.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -814,10 +814,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/samba.7
+Index: experimental/docs/manpages/samba.7
===================================================================
---- a/docs/manpages/samba.7 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/samba.7 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/samba.7
++++ experimental/docs/manpages/samba.7
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -842,10 +842,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smb.conf.5
+Index: experimental/docs/manpages/smb.conf.5
===================================================================
---- a/docs/manpages/smb.conf.5 2009-11-08 15:55:35.000000000 +0100
-+++ b/docs/manpages/smb.conf.5 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smb.conf.5
++++ experimental/docs/manpages/smb.conf.5
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -870,10 +870,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbcacls.1
+Index: experimental/docs/manpages/smbcacls.1
===================================================================
---- a/docs/manpages/smbcacls.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbcacls.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbcacls.1
++++ experimental/docs/manpages/smbcacls.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -898,10 +898,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbclient.1
+Index: experimental/docs/manpages/smbclient.1
===================================================================
---- a/docs/manpages/smbclient.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbclient.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbclient.1
++++ experimental/docs/manpages/smbclient.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -926,10 +926,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbcontrol.1
+Index: experimental/docs/manpages/smbcontrol.1
===================================================================
---- a/docs/manpages/smbcontrol.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbcontrol.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbcontrol.1
++++ experimental/docs/manpages/smbcontrol.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -954,10 +954,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbcquotas.1
+Index: experimental/docs/manpages/smbcquotas.1
===================================================================
---- a/docs/manpages/smbcquotas.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbcquotas.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbcquotas.1
++++ experimental/docs/manpages/smbcquotas.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -982,10 +982,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbd.8
+Index: experimental/docs/manpages/smbd.8
===================================================================
---- a/docs/manpages/smbd.8 2009-11-08 15:55:33.000000000 +0100
-+++ b/docs/manpages/smbd.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbd.8
++++ experimental/docs/manpages/smbd.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1010,10 +1010,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbget.1
+Index: experimental/docs/manpages/smbget.1
===================================================================
---- a/docs/manpages/smbget.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbget.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbget.1
++++ experimental/docs/manpages/smbget.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1038,10 +1038,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbgetrc.5
+Index: experimental/docs/manpages/smbgetrc.5
===================================================================
---- a/docs/manpages/smbgetrc.5 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbgetrc.5 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbgetrc.5
++++ experimental/docs/manpages/smbgetrc.5
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1066,10 +1066,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbpasswd.5
+Index: experimental/docs/manpages/smbpasswd.5
===================================================================
---- a/docs/manpages/smbpasswd.5 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbpasswd.5 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbpasswd.5
++++ experimental/docs/manpages/smbpasswd.5
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1094,10 +1094,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbpasswd.8
+Index: experimental/docs/manpages/smbpasswd.8
===================================================================
---- a/docs/manpages/smbpasswd.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbpasswd.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbpasswd.8
++++ experimental/docs/manpages/smbpasswd.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1122,10 +1122,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbspool.8
+Index: experimental/docs/manpages/smbspool.8
===================================================================
---- a/docs/manpages/smbspool.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbspool.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbspool.8
++++ experimental/docs/manpages/smbspool.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1150,10 +1150,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbstatus.1
+Index: experimental/docs/manpages/smbstatus.1
===================================================================
---- a/docs/manpages/smbstatus.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbstatus.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbstatus.1
++++ experimental/docs/manpages/smbstatus.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1178,10 +1178,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbtar.1
+Index: experimental/docs/manpages/smbtar.1
===================================================================
---- a/docs/manpages/smbtar.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbtar.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbtar.1
++++ experimental/docs/manpages/smbtar.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1206,10 +1206,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/smbtree.1
+Index: experimental/docs/manpages/smbtree.1
===================================================================
---- a/docs/manpages/smbtree.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/smbtree.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/smbtree.1
++++ experimental/docs/manpages/smbtree.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1234,10 +1234,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/swat.8
+Index: experimental/docs/manpages/swat.8
===================================================================
---- a/docs/manpages/swat.8 2009-11-08 15:55:33.000000000 +0100
-+++ b/docs/manpages/swat.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/swat.8
++++ experimental/docs/manpages/swat.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1262,10 +1262,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/tdbbackup.8
+Index: experimental/docs/manpages/tdbbackup.8
===================================================================
---- a/docs/manpages/tdbbackup.8 2009-11-08 15:55:33.000000000 +0100
-+++ b/docs/manpages/tdbbackup.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/tdbbackup.8
++++ experimental/docs/manpages/tdbbackup.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1290,10 +1290,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/tdbdump.8
+Index: experimental/docs/manpages/tdbdump.8
===================================================================
---- a/docs/manpages/tdbdump.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/tdbdump.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/tdbdump.8
++++ experimental/docs/manpages/tdbdump.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1318,10 +1318,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/tdbtool.8
+Index: experimental/docs/manpages/tdbtool.8
===================================================================
---- a/docs/manpages/tdbtool.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/tdbtool.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/tdbtool.8
++++ experimental/docs/manpages/tdbtool.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1346,10 +1346,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/testparm.1
+Index: experimental/docs/manpages/testparm.1
===================================================================
---- a/docs/manpages/testparm.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/testparm.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/testparm.1
++++ experimental/docs/manpages/testparm.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1374,10 +1374,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/umount.cifs.8
+Index: experimental/docs/manpages/umount.cifs.8
===================================================================
---- a/docs/manpages/umount.cifs.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/umount.cifs.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/umount.cifs.8
++++ experimental/docs/manpages/umount.cifs.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1402,10 +1402,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_audit.8
+Index: experimental/docs/manpages/vfs_audit.8
===================================================================
---- a/docs/manpages/vfs_audit.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_audit.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_audit.8
++++ experimental/docs/manpages/vfs_audit.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1430,10 +1430,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_cacheprime.8
+Index: experimental/docs/manpages/vfs_cacheprime.8
===================================================================
---- a/docs/manpages/vfs_cacheprime.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_cacheprime.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_cacheprime.8
++++ experimental/docs/manpages/vfs_cacheprime.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1458,10 +1458,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_cap.8
+Index: experimental/docs/manpages/vfs_cap.8
===================================================================
---- a/docs/manpages/vfs_cap.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/vfs_cap.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_cap.8
++++ experimental/docs/manpages/vfs_cap.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1486,10 +1486,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_catia.8
+Index: experimental/docs/manpages/vfs_catia.8
===================================================================
---- a/docs/manpages/vfs_catia.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_catia.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_catia.8
++++ experimental/docs/manpages/vfs_catia.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1514,10 +1514,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_commit.8
+Index: experimental/docs/manpages/vfs_commit.8
===================================================================
---- a/docs/manpages/vfs_commit.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_commit.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_commit.8
++++ experimental/docs/manpages/vfs_commit.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1542,10 +1542,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_default_quota.8
+Index: experimental/docs/manpages/vfs_default_quota.8
===================================================================
---- a/docs/manpages/vfs_default_quota.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/vfs_default_quota.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_default_quota.8
++++ experimental/docs/manpages/vfs_default_quota.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1570,10 +1570,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_extd_audit.8
+Index: experimental/docs/manpages/vfs_extd_audit.8
===================================================================
---- a/docs/manpages/vfs_extd_audit.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_extd_audit.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_extd_audit.8
++++ experimental/docs/manpages/vfs_extd_audit.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1598,10 +1598,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_fake_perms.8
+Index: experimental/docs/manpages/vfs_fake_perms.8
===================================================================
---- a/docs/manpages/vfs_fake_perms.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_fake_perms.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_fake_perms.8
++++ experimental/docs/manpages/vfs_fake_perms.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1626,10 +1626,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_fileid.8
+Index: experimental/docs/manpages/vfs_fileid.8
===================================================================
---- a/docs/manpages/vfs_fileid.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_fileid.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_fileid.8
++++ experimental/docs/manpages/vfs_fileid.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1654,10 +1654,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_full_audit.8
+Index: experimental/docs/manpages/vfs_full_audit.8
===================================================================
---- a/docs/manpages/vfs_full_audit.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_full_audit.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_full_audit.8
++++ experimental/docs/manpages/vfs_full_audit.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1682,10 +1682,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_gpfs.8
+Index: experimental/docs/manpages/vfs_gpfs.8
===================================================================
---- a/docs/manpages/vfs_gpfs.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_gpfs.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_gpfs.8
++++ experimental/docs/manpages/vfs_gpfs.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1710,10 +1710,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_netatalk.8
+Index: experimental/docs/manpages/vfs_netatalk.8
===================================================================
---- a/docs/manpages/vfs_netatalk.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_netatalk.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_netatalk.8
++++ experimental/docs/manpages/vfs_netatalk.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1738,10 +1738,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_notify_fam.8
+Index: experimental/docs/manpages/vfs_notify_fam.8
===================================================================
---- a/docs/manpages/vfs_notify_fam.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_notify_fam.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_notify_fam.8
++++ experimental/docs/manpages/vfs_notify_fam.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1766,10 +1766,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_prealloc.8
+Index: experimental/docs/manpages/vfs_prealloc.8
===================================================================
---- a/docs/manpages/vfs_prealloc.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_prealloc.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_prealloc.8
++++ experimental/docs/manpages/vfs_prealloc.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1794,10 +1794,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_readahead.8
+Index: experimental/docs/manpages/vfs_readahead.8
===================================================================
---- a/docs/manpages/vfs_readahead.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_readahead.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_readahead.8
++++ experimental/docs/manpages/vfs_readahead.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1822,10 +1822,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_readonly.8
+Index: experimental/docs/manpages/vfs_readonly.8
===================================================================
---- a/docs/manpages/vfs_readonly.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/vfs_readonly.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_readonly.8
++++ experimental/docs/manpages/vfs_readonly.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1850,10 +1850,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_recycle.8
+Index: experimental/docs/manpages/vfs_recycle.8
===================================================================
---- a/docs/manpages/vfs_recycle.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_recycle.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_recycle.8
++++ experimental/docs/manpages/vfs_recycle.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1878,10 +1878,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_shadow_copy.8
+Index: experimental/docs/manpages/vfs_shadow_copy.8
===================================================================
---- a/docs/manpages/vfs_shadow_copy.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_shadow_copy.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_shadow_copy.8
++++ experimental/docs/manpages/vfs_shadow_copy.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1906,10 +1906,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_shadow_copy2.8
+Index: experimental/docs/manpages/vfs_shadow_copy2.8
===================================================================
---- a/docs/manpages/vfs_shadow_copy2.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_shadow_copy2.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_shadow_copy2.8
++++ experimental/docs/manpages/vfs_shadow_copy2.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1934,10 +1934,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_smb_traffic_analyzer.8
+Index: experimental/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
---- a/docs/manpages/vfs_smb_traffic_analyzer.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/vfs_smb_traffic_analyzer.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_smb_traffic_analyzer.8
++++ experimental/docs/manpages/vfs_smb_traffic_analyzer.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1962,10 +1962,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_streams_depot.8
+Index: experimental/docs/manpages/vfs_streams_depot.8
===================================================================
---- a/docs/manpages/vfs_streams_depot.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/vfs_streams_depot.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_streams_depot.8
++++ experimental/docs/manpages/vfs_streams_depot.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1990,10 +1990,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_streams_xattr.8
+Index: experimental/docs/manpages/vfs_streams_xattr.8
===================================================================
---- a/docs/manpages/vfs_streams_xattr.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/vfs_streams_xattr.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_streams_xattr.8
++++ experimental/docs/manpages/vfs_streams_xattr.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2018,10 +2018,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfs_xattr_tdb.8
+Index: experimental/docs/manpages/vfs_xattr_tdb.8
===================================================================
---- a/docs/manpages/vfs_xattr_tdb.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfs_xattr_tdb.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfs_xattr_tdb.8
++++ experimental/docs/manpages/vfs_xattr_tdb.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2046,10 +2046,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/vfstest.1
+Index: experimental/docs/manpages/vfstest.1
===================================================================
---- a/docs/manpages/vfstest.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/vfstest.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/vfstest.1
++++ experimental/docs/manpages/vfstest.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2074,10 +2074,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/wbinfo.1
+Index: experimental/docs/manpages/wbinfo.1
===================================================================
---- a/docs/manpages/wbinfo.1 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/wbinfo.1 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/wbinfo.1
++++ experimental/docs/manpages/wbinfo.1
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2102,10 +2102,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/winbind_krb5_locator.7
+Index: experimental/docs/manpages/winbind_krb5_locator.7
===================================================================
---- a/docs/manpages/winbind_krb5_locator.7 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/winbind_krb5_locator.7 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/winbind_krb5_locator.7
++++ experimental/docs/manpages/winbind_krb5_locator.7
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2130,10 +2130,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/winbindd.8
+Index: experimental/docs/manpages/winbindd.8
===================================================================
---- a/docs/manpages/winbindd.8 2009-11-08 15:55:33.000000000 +0100
-+++ b/docs/manpages/winbindd.8 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/docs/manpages/winbindd.8
++++ experimental/docs/manpages/winbindd.8
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Modified: branches/samba/experimental/debian/patches/installswat.sh.patch
===================================================================
--- branches/samba/experimental/debian/patches/installswat.sh.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/installswat.sh.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -4,10 +4,10 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: b/source3/script/installswat.sh
+Index: experimental/source3/script/installswat.sh
===================================================================
---- a/source3/script/installswat.sh 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/script/installswat.sh 2009-11-08 15:55:33.000000000 +0100
+--- experimental.orig/source3/script/installswat.sh
++++ experimental/source3/script/installswat.sh
@@ -198,7 +198,11 @@
# Install/ remove Using Samba book (but only if it is there)
Modified: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -6,11 +6,11 @@
Bug: https://bugzilla.samba.org/show_bug.cgi?id=5525
Forwarded: yes
-Index: b/source3/smbd/server.c
+Index: experimental/source3/smbd/server.c
===================================================================
---- a/source3/smbd/server.c 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/smbd/server.c 2009-11-08 15:55:36.000000000 +0100
-@@ -699,6 +699,10 @@
+--- experimental.orig/source3/smbd/server.c
++++ experimental/source3/smbd/server.c
+@@ -710,6 +710,10 @@
int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
Modified: branches/samba/experimental/debian/patches/pam-examples.patch
===================================================================
--- branches/samba/experimental/debian/patches/pam-examples.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/pam-examples.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -2,10 +2,10 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: b/source3/pam_smbpass/README
+Index: experimental/source3/pam_smbpass/README
===================================================================
---- a/source3/pam_smbpass/README 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/pam_smbpass/README 2009-11-08 15:55:34.000000000 +0100
+--- experimental.orig/source3/pam_smbpass/README
++++ experimental/source3/pam_smbpass/README
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
Modified: branches/samba/experimental/debian/patches/smbclient-pager.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbclient-pager.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/smbclient-pager.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -3,11 +3,11 @@
Bug-Debian: http://bugs.debian.org/135603
Forwarded: not-needed
-Index: b/source3/include/local.h
+Index: experimental/source3/include/local.h
===================================================================
---- a/source3/include/local.h 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/include/local.h 2009-11-08 15:55:34.000000000 +0100
-@@ -109,7 +109,7 @@
+--- experimental.orig/source3/include/local.h
++++ experimental/source3/include/local.h
+@@ -127,7 +127,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
#ifndef PAGER
Modified: branches/samba/experimental/debian/patches/smbtar-bashism.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbtar-bashism.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/smbtar-bashism.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/486056
Forwarded: no
-Index: b/source3/script/smbtar
+Index: experimental/source3/script/smbtar
===================================================================
---- a/source3/script/smbtar 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/script/smbtar 2009-11-08 15:55:36.000000000 +0100
+--- experimental.orig/source3/script/smbtar
++++ experimental/source3/script/smbtar
@@ -151,7 +151,7 @@
if [ -z "$verbose" ]; then
echo "server is $server"
Modified: branches/samba/experimental/debian/patches/undefined-symbols.patch
===================================================================
--- branches/samba/experimental/debian/patches/undefined-symbols.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/undefined-symbols.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -9,13 +9,13 @@
Bug-Debian: http://bugs.debian.org/281181
Forwarded: no
-Index: b/source3/Makefile.in
+Index: experimental/source3/Makefile.in
===================================================================
---- a/source3/Makefile.in 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/Makefile.in 2009-11-08 15:55:34.000000000 +0100
-@@ -2128,7 +2128,7 @@
+--- experimental.orig/source3/Makefile.in
++++ experimental/source3/Makefile.in
+@@ -2259,7 +2259,7 @@
- $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
+ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
+ @$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
Modified: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch 2009-12-19 11:30:34 UTC (rev 3177)
+++ branches/samba/experimental/debian/patches/usershare.patch 2009-12-19 11:31:06 UTC (rev 3178)
@@ -7,11 +7,11 @@
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
Forwarded: not-needed
-Index: b/docs/manpages/net.8
+Index: experimental/docs/manpages/net.8
===================================================================
---- a/docs/manpages/net.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/net.8 2009-11-08 15:55:35.000000000 +0100
-@@ -917,9 +917,9 @@
+--- experimental.orig/docs/manpages/net.8
++++ experimental/docs/manpages/net.8
+@@ -916,9 +916,9 @@
Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\&. In this case the secret is used as the password for the user DN used to bind to the ldap server\&.
.SS "USERSHARE"
.PP
@@ -23,11 +23,11 @@
.PP
The usershare commands are:
.RS 4
-Index: b/source3/param/loadparm.c
+Index: experimental/source3/param/loadparm.c
===================================================================
---- a/source3/param/loadparm.c 2009-11-08 15:54:27.000000000 +0100
-+++ b/source3/param/loadparm.c 2009-11-08 15:55:35.000000000 +0100
-@@ -5098,7 +5098,7 @@
+--- experimental.orig/source3/param/loadparm.c
++++ experimental/source3/param/loadparm.c
+@@ -5189,7 +5189,7 @@
string_set(&Globals.szUsersharePath, s);
SAFE_FREE(s);
string_set(&Globals.szUsershareTemplateShare, "");
More information about the Pkg-samba-maint
mailing list