[Pkg-samba-maint] r3231 - branches/samba/experimental/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Fri Jan 15 22:27:28 UTC 2010
Author: bubulle
Date: 2010-01-15 22:27:26 +0000 (Fri, 15 Jan 2010)
New Revision: 3231
Modified:
branches/samba/experimental/debian/patches/autoconf.patch
Log:
Regenerate the patch for this version
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2010-01-15 22:27:09 UTC (rev 3230)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2010-01-15 22:27:26 UTC (rev 3231)
@@ -8400,10 +8400,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_uint_t=yes
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
@@ -8714,7 +8714,14 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_int16_t=yes
-+
+-fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+
+# 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"
@@ -8722,42 +8729,26 @@
+# by default.
+if test "x$debug" = "xyes" ; then
+ CFLAGS="${CFLAGS} -g"
-+fi
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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
-+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
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define int16_t short
-_ACEOF
-+if eval "test x$enable_socket_wrapper = xyes"; then
--fi
-+$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++ enableval=$enable_socket_wrapper;
+ fi
-{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
-$as_echo_n "checking for uint16_t... " >&6; }
@@ -8837,27 +8828,30 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ DEFAULT_TEST_OPTIONS=--socket-wrapper
-+ HAVE_SOCKET_WRAPPER=yes
- ac_cv_type_uint16_t=yes
-+ # this is only used for samba3
-+ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++ enable_socket_wrapper=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++if eval "test x$enable_socket_wrapper = xyes"; then
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
-fi
++ DEFAULT_TEST_OPTIONS=--socket-wrapper
++ HAVE_SOCKET_WRAPPER=yes
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+# Check whether --enable-nss-wrapper was given.
-+if test "${enable_nss_wrapper+set}" = set; then :
-+ enableval=$enable_nss_wrapper;
++ # this is only used for samba3
++ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
-$as_echo "$ac_cv_type_uint16_t" >&6; }
@@ -8869,13 +8863,8 @@
-#define uint16_t unsigned short
-_ACEOF
-+HAVE_NSS_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_nss_wrapper=yes
- fi
+-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
@@ -8956,25 +8945,26 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
- ac_cv_type_int32_t=yes
-+ HAVE_NSS_WRAPPER=yes
-+
-+ # this is only used for samba3
-+ NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++ enableval=$enable_nss_wrapper;
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
-
-fi
++HAVE_NSS_WRAPPER=no
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++if eval "test x$developer = xyes"; then
++ enable_nss_wrapper=yes
+ 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
@@ -8984,8 +8974,10 @@
-cat >>confdefs.h <<_ACEOF
-#define int32_t int
-_ACEOF
++if eval "test x$enable_nss_wrapper = xyes"; then
-fi
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
-$as_echo_n "checking for uint32_t... " >&6; }
@@ -9065,20 +9057,11 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
-+SWAT_INSTALL_TARGETS=installswat
-+
-+# Check whether --enable-swat was given.
-+if test "${enable_swat+set}" = set; then :
-+ enableval=$enable_swat;
-+ case "$enable_swat" in
-+ no)
-+ SWAT_SBIN_TARGETS=''
-+ SWAT_INSTALL_TARGETS=''
-+ ;;
-+ esac
++ HAVE_NSS_WRAPPER=yes
- ac_cv_type_uint32_t=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
@@ -9107,17 +9090,8 @@
-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
-$as_echo_n "checking for int32_t... " >&6; }
-if test "${ac_cv_type_int32_t+set}" = set; then
-+# Probe the gcc version for extra CFLAGS. We always stash these in
-+# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
-+# Makefile edit, avoiding the need to re-run configure.
-+if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
-+ DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
-+ # Add -Wdeclaration-after-statement if compiler supports it
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
-+$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
-+if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_int32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -9158,22 +9132,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="$CFLAGS -Wdeclaration-after-statement";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Wdeclaration_after_statement=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -9183,12 +9142,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9208,37 +9162,32 @@
- 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
--
++SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
++SWAT_INSTALL_TARGETS=installswat
++
++# Check whether --enable-swat was given.
++if test "${enable_swat+set}" = set; then :
++ enableval=$enable_swat;
++ case "$enable_swat" in
++ no)
++ SWAT_SBIN_TARGETS=''
++ SWAT_INSTALL_TARGETS=''
++ ;;
++ esac
+
- ac_cv_type_int32_t=yes
-+ samba_cv_HAVE_Wdeclaration_after_statement=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-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
@@ -9247,37 +9196,26 @@
-if test "x$ac_cv_type_int32_t" = x""yes; then
- :
-else
-+ if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
-+ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
-+ fi
-cat >>confdefs.h <<_ACEOF
-#define int32_t long
-_ACEOF
-+ #-Werror-implicit-function-declaration
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
-+$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
-+if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-fi
-{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
-$as_echo_n "checking for uint32_t... " >&6; }
-if test "${ac_cv_type_uint32_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=cross
++# 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_uint32_t=no
-cat >conftest.$ac_ext <<_ACEOF
@@ -9285,8 +9223,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 ()
@@ -9296,12 +9233,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9358,12 +9290,23 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_type_uint32_t=yes
-fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++ 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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -35022,9 +34965,7 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -35044,12 +34985,9 @@
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+ samba_cv_HAVE_Werror_implicit_function_declaration=no
- fi
+-fi
-rm -f conftest.val
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-
@@ -35125,7 +35063,7 @@
- }
- return !cs[0] && !zero.x;
-#endif
-
+-
- ;
- return 0;
-}
@@ -35152,49 +35090,60 @@
-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;
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- ac_cv_c_const=no
--fi
-
++ int main(void)
++ {
++ return 0;
++ }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Wdeclaration_after_statement=yes
++else
++ samba_cv_HAVE_Wdeclaration_after_statement=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_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
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
++
-+ if test x"$picky_developer" = x"yes"; then
-+ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+ fi
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
++ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
++ fi
++
++ #-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
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
@@ -35202,14 +35151,33 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
--
--_ACEOF
+
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -35229,47 +35197,70 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_inline=$ac_kw
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+#################################################
-+# 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; }
++ 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;
-+# 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
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
++$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
++ if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
++ DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
++ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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; }
++ # 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: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
++#################################################
++# 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; }
-case $ac_cv_c_inline in
- inline | yes) ;;
-- *)
++$as_echo "#define WITH_PROFILE 1" >>confdefs.h
++
++ samba_cv_WITH_PROFILE=yes
++ ;;
+ *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
@@ -35279,14 +35270,25 @@
-#define inline $ac_val
-#endif
-_ACEOF
-- ;;
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ samba_cv_WITH_PROFILE=no
+ ;;
-esac
-+merged_build_possible=yes
++ esac
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++fi
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
++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.
@@ -36490,7 +36492,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -Werror";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Werror=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -36500,7 +36517,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36520,16 +36542,55 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_size_t=yes
++ samba_cv_HAVE_Werror=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+-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;
-- ac_cv_type_size_t=yes
--fi
+ 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
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
+- :
++
+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="$CFLAGS -Werror";
++ CFLAGS="$CFLAGS -w2";
+ export CFLAGS;
+ old_CPPFLAGS="$CPPFLAGS";
+ CPPFLAGS="$CPPFLAGS";
@@ -36538,38 +36599,31 @@
+ LDFLAGS="$LDFLAGS";
+ export LDFLAGS;
+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_Werror=cross
++ samba_cv_HAVE_w2=cross
else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned int
+ int main(void)
+ {
+ return 0;
+ }
-+_ACEOF
+ _ACEOF
+-
+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror=yes
++ samba_cv_HAVE_w2=yes
+else
-+ samba_cv_HAVE_Werror=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ samba_cv_HAVE_w2=no
++fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
--{ $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
+-{ $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
+ CFLAGS="$old_CFLAGS";
+ old_CFLAGS="";
+ export CFLAGS;
@@ -36579,17 +36633,17 @@
+ LDFLAGS="$old_LDFLAGS";
+ old_LDFLAGS="";
+ export LDFLAGS;
-
- fi
--
--{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
--$as_echo_n "checking for pid_t... " >&6; }
--if test "${ac_cv_type_pid_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
-+$as_echo "$samba_cv_HAVE_Werror" >&6; }
-+if test x"$samba_cv_HAVE_Werror" = x"yes"; then
-+ Werror_FLAGS="-Werror"
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
++$as_echo "$samba_cv_HAVE_w2" >&6; }
++if test x"$samba_cv_HAVE_w2" = x"yes"; then
++ Werror_FLAGS="-w2"
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
++$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
++if test "${samba_cv_HAVE_errwarn+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
@@ -36631,7 +36685,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++
++ 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
-int
-main ()
@@ -36641,7 +36710,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36661,80 +36735,67 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
-+$as_echo_n "checking that the C compiler understands -w2... " >&6; }
-+if test "${samba_cv_HAVE_w2+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_errwarn=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_pid_t=yes
--fi
++ samba_cv_HAVE_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
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ 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
+-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. */
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
-+ 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 *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam 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
-{ $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
++fi
++
++############################################
++# check if the compiler can handle negative enum values
++# and don't truncate the values to INT_MAX
++# a runtime test is needed here
+
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
-$as_echo_n "checking for struct stat.st_rdev... " >&6; }
-if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
-+$as_echo "$samba_cv_HAVE_w2" >&6; }
-+if test x"$samba_cv_HAVE_w2" = x"yes"; then
-+ Werror_FLAGS="-w2"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
++$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
++if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -36772,11 +36833,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
-+$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
-+if test "${samba_cv_HAVE_errwarn+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -36785,21 +36842,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="$CFLAGS -errwarn=%all";
-+ export CFLAGS;
-+ old_CPPFLAGS="$CPPFLAGS";
-+ CPPFLAGS="$CPPFLAGS";
-+ export CPPFLAGS;
-+ old_LDFLAGS="$LDFLAGS";
-+ LDFLAGS="$LDFLAGS";
-+ export LDFLAGS;
-+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_errwarn=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -36810,12 +36853,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36835,73 +36873,37 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_errwarn=yes
++ 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
- $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
- fi
+-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
-+$as_echo "$samba_cv_HAVE_errwarn" >&6; }
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+ Werror_FLAGS="-errwarn=%all"
-+fi
- fi
--
+-fi
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then
-
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_RDEV 1
--_ACEOF
-+############################################
-+# check if the compiler can handle negative enum values
-+# and don't truncate the values to INT_MAX
-+# a runtime test is needed here
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
-+$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
-+if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+ if test "$cross_compiling" = yes; then :
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
+ #include <stdio.h>
+ enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
+ int main(void) {
+ enum negative_values v1 = NEGATIVE_VALUE;
+ unsigned v2 = NEGATIVE_VALUE;
-+
+
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_RDEV 1
+-_ACEOF
+ if (v1 != 0xFFFFFFFF) {
+ printf("%u != 0xFFFFFFFF\n", v1);
+ return 1;
@@ -37252,6 +37254,14 @@
- 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_wchar_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
@@ -37259,70 +37269,43 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_wchar_t=yes
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "`uname`" = "HP-UX"; then
-+ if test "$ac_cv_c_compiler_gnu" = no; then
-+ # special override for broken HP-UX compiler - I can't find a way to test
-+ # this properly (its a compiler bug)
-+ CFLAGS="$CFLAGS -AC99";
-+ c99_init=yes;
-+ fi
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
-$as_echo "$ac_cv_type_wchar_t" >&6; }
-if test "x$ac_cv_type_wchar_t" = x""yes; then
- :
-else
-
+-
-cat >>confdefs.h <<_ACEOF
-#define wchar_t unsigned short
-_ACEOF
-+if test x"$c99_init" = x"yes"; then
-+ saved_CFLAGS=""
+-
+-fi
+-
-+else
-+ CFLAGS="$saved_CFLAGS"
-+ saved_CFLAGS=""
-+ as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
- fi
-
-
-############################################
-# for cups support we need libcups, and a handful of header files
-+UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
-+$as_echo_n "checking uname -s... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
-+$as_echo "${UNAME_S}" >&6; }
-
+-
-# Check whether --enable-cups was given.
-if test "${enable_cups+set}" = set; then
- enableval=$enable_cups;
--fi
-+UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
-+$as_echo_n "checking uname -r... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
-+$as_echo "${UNAME_R}" >&6; }
++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
-+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"$c99_init" = x"yes"; then
++ saved_CFLAGS=""
-if test x$enable_cups != xno; then
- # Extract the first word of "cups-config", so it can be a program name with args.
@@ -37351,54 +37334,44 @@
-done
-done
-IFS=$as_save_IFS
-+UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
-+$as_echo_n "checking uname -p... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
-+$as_echo "${UNAME_P}" >&6; }
-
+-
- ;;
-+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
+-esac
-fi
-CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
-if test -n "$CUPS_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
-$as_echo "$CUPS_CONFIG" >&6; }
--else
+ else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
--fi
++ CFLAGS="$saved_CFLAGS"
++ saved_CFLAGS=""
++ as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
+ fi
-+DYNEXP=
-+LDSHFLAGS_Z_DEFS=
++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; }
- if test "x$CUPS_CONFIG" != x; then
-+LDSHFLAGS_Z_NODEFS=
-
+-
- ac_save_CFLAGS=$CFLAGS
- ac_save_LDFLAGS=$LDFLAGS
- ac_save_PRINT_LIBS=$PRINT_LIBS
- CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
- LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
- PRINT_LIBS="$PRINT_LIBS -lcups"
+-
++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; }
-+default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
-
-for ac_header in cups/cups.h cups/language.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37447,31 +37420,28 @@
-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"
++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; }
- ac_header_compiler=no
-+if test "x$developer" = xyes; then
-+ default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
-+ default_shared_modules="$default_shared_modules charset_weird perfcount_test"
- fi
+-fi
++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; }
-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)
++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; }
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -37488,7 +37458,15 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ case "$host_os" in
++ *irix6*)
++ #TODO add to libreplace
++ if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
++ CFLAGS="$CFLAGS -diag_error 1035"
++ CFLAGS="$CFLAGS -woff 1209,1174,3201"
++ fi
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
@@ -37505,24 +37483,14 @@
-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="
-+ ;;
++DYNEXP=
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -37565,14 +37533,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+#
-+# AIX4.x doesn't even admit to having large
-+# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
-+#
-+ *aix4*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
++LDSHFLAGS_Z_DEFS=
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -37581,150 +37542,100 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-+$as_echo "#define _LARGE_FILES 1" >>confdefs.h
++LDSHFLAGS_Z_NODEFS=
-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
++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"
- 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"
++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"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CUPS 1
-_ACEOF
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++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
- samba_cv_HAVE_CUPS=yes
-+ ;;
-+ *)
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+ LDFLAGS="$LDFLAGS -lthread"
++#
++# 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 _LARGEFILE64_SOURCE 1" >>confdefs.h
++$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
++ ;;
++ esac
++ ;;
-ac_check_lib_ext_save_LIBS=$LIBS
-LIBS="-lcups $PRINT_LIBS $LIBS"
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++#
++# CRAY Unicos has broken const handling
++ *unicos*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
++$as_echo "disabling const" >&6; }
++ CPPFLAGS="$CPPFLAGS -Dconst="
++ ;;
-+ ;;
-+ esac
-+ else
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+ LDFLAGS="$LDFLAGS -lthread"
++#
++# AIX4.x doesn't even admit to having large
++# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
++#
++ *aix4*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++$as_echo "#define _LARGE_FILES 1" >>confdefs.h
++ ;;
++#
++# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
++# to the existance of large files..
++# Note that -D_LARGEFILE64_SOURCE is different from the Sun
++# recommendations on large file support, however it makes the
++# compile work using gcc 2.7 and 2.8, whereas using the Sun
++# recommendation makes the compile fail on gcc2.7. JRA.
++#
++# Solaris uses SYSV printing. Make sure to set that here. --jerry
++#
++ *solaris*)
- { $as_echo "$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
+-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. */
++$as_echo "#define SYSV 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"
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
- #endif
+-#endif
-char httpConnectEncrypt ();
-int
-main ()
@@ -37757,64 +37668,87 @@
- }; 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
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ 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"
+
- ac_cv_lib_ext_cups_httpConnectEncrypt=no;
- ac_cv_lib_ext_cups=no
-fi
--
++$as_echo "#define _LARGEFILE64_SOURCE 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
--
-+ SINIX_LFS_SUPPORT=no
- fi
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
+
+-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
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+-fi
+
-LIBS=$ac_check_lib_ext_save_LIBS
--
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+
-if test $ac_cv_lib_ext_cups = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCUPS 1
-_ACEOF
--
++ ;;
++ esac
++ else
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
+
- 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"
-
+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++
++$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
+
-fi
-+ CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
-+ LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
-+ LIBS="`getconf LFS64_LIBS` $LIBS"
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
-+$as_echo "$SINIX_LFS_SUPPORT" >&6; }
-+ fi
-+ ;;
++ ;;
++ *freebsd*|*dragonfly*)
- else
- { $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
@@ -37823,10 +37757,7 @@
- LDFLAGS=$ac_save_LDFLAGS
- PRINT_LIBS=$ac_save_PRINT_LIBS
- fi
-+# Systems with LFS support.
-+#
-+ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++$as_echo "#define FREEBSD 1" >>confdefs.h
- elif test x"$enable_cups" = x"yes"; then
- { { $as_echo "$as_me:$LINENO: error: Cups support required but cups-config not located. Make sure cups-devel related files are installed." >&5
@@ -37834,30 +37765,77 @@
- { (exit 1); exit 1; }; }
- fi
-fi
-+$as_echo "#define _LARGEFILE64_SOURCE 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"
-# Check whether --enable-iprint was given.
-if test "${enable_iprint+set}" = set; then
- enableval=$enable_iprint;
-fi
++$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 _FILE_OFFSET_BITS 64" >>confdefs.h
++$as_echo "#define _SYSV 1" >>confdefs.h
-if test x$enable_iprint != xno; then
- if test x"$samba_cv_HAVE_CUPS" = xyes; then
++ esac
++ ;;
++#
++# Tests needed for SINIX large file support.
++#
++ *sysv4*)
++ if test $host = mips-sni-sysv4 ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ SINIX_LFS_SUPPORT=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IPRINT 1
--_ACEOF
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
++}
+ _ACEOF
+-
- elif test x"$enable_iprint" = x"yes"; then
- { { $as_echo "$as_me:$LINENO: error: iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled." >&5
-$as_echo "$as_me: error: iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled." >&2;}
- { (exit 1); exit 1; }; }
- fi
--fi
-+ ;;
++if ac_fn_c_try_run "$LINENO"; then :
++ SINIX_LFS_SUPPORT=yes
++else
++ SINIX_LFS_SUPPORT=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-############################################
-# check if the compiler will optimize out function calls
@@ -37865,73 +37843,48 @@
-$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
-if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then
- $as_echo_n "(cached) " >&6
-+# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
-+#
-+ *linux*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+ old_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+ if test "$cross_compiling" = yes; then :
-+ LINUX_LFS_SUPPORT=cross
- else
--
+-else
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$SINIX_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
+
- 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. */
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-#include <stdio.h>
-int
-main ()
-{
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <string.h>
-+#include <stdlib.h>
-+main() {
-+#if _LFS64_LARGEFILE == 1
-+ struct utsname uts;
-+ char *release;
-+ int major, minor;
++ CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
++ LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
++ LIBS="`getconf LFS64_LIBS` $LIBS"
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
++$as_echo "$SINIX_LFS_SUPPORT" >&6; }
++ fi
++ ;;
- if (0) {
- this_function_does_not_exist();
- } else {
- return 1;
- }
-+ /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+ int libc_major = __GLIBC__;
-+ int libc_minor = __GLIBC_MINOR__;
++# Systems with LFS support.
++#
++ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+ if (libc_major < 2)
-+ exit(1);
-+ if (libc_minor < 2)
-+ exit(1);
-+#endif
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- ;
- return 0;
-+ /* Ensure this is kernel 2.4 or higher */
-+
-+ uname(&uts);
-+ release = strdup(uts.release);
-+ major = atoi(strsep(&release, "."));
-+ minor = atoi(strsep(&release, "."));
-+
-+ if (major > 2 || (major == 2 && minor > 3))
-+ exit(0);
-+ exit(1);
-+#else
-+ exit(1);
-+#endif
- }
-+
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -37954,22 +37907,18 @@
- $as_test_x conftest$ac_exeext
- }; then
- samba_cv_optimize_out_funcation_calls=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ LINUX_LFS_SUPPORT=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- samba_cv_optimize_out_funcation_calls=no
-+ LINUX_LFS_SUPPORT=no
- fi
--
+-fi
++$as_echo "#define _FILE_OFFSET_BITS 64" >>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 *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_optimize_out_funcation_calls" >&5
-$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
-if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
@@ -37977,12 +37926,10 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
-_ACEOF
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$LINUX_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++ ;;
-#############################################
-# check for fd passing struct via msg_control
@@ -37990,24 +37937,41 @@
-$as_echo_n "checking for fd passing via msg_control... " >&6; }
-if test "${samba_cv_msghdr_msg_control+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
-
++# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
++#
++ *linux*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ LINUX_LFS_SUPPORT=cross
+ else
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <sys/types.h>
--#include <stdlib.h>
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <string.h>
+ #include <stdlib.h>
-#include <stddef.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-int
-main ()
-{
++main() {
++#if _LFS64_LARGEFILE == 1
++ struct utsname uts;
++ char *release;
++ int major, minor;
- struct msghdr msg;
- union {
@@ -38016,12 +37980,35 @@
- } control_un;
- msg.msg_control = control_un.control;
- msg.msg_controllen = sizeof(control_un.control);
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++ /* Ensure this is glibc 2.2 or higher */
++#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
++ int libc_major = __GLIBC__;
++ int libc_minor = __GLIBC_MINOR__;
- ;
- return 0;
--}
--_ACEOF
++ if (libc_major < 2)
++ exit(1);
++ if (libc_minor < 2)
++ exit(1);
++#endif
++
++ /* Ensure this is kernel 2.4 or higher */
++
++ uname(&uts);
++ release = strdup(uts.release);
++ major = atoi(strsep(&release, "."));
++ minor = atoi(strsep(&release, "."));
++
++ if (major > 2 || (major == 2 && minor > 3))
++ exit(0);
++ exit(1);
++#else
++ exit(1);
++#endif
+ }
++
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38041,36 +38028,32 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_control=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ LINUX_LFS_SUPPORT=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
-+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
-+ ;;
-
+-
- samba_cv_msghdr_msg_control=no
--fi
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+ *darwin*)
-
++ LINUX_LFS_SUPPORT=no
+ fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
-$as_echo "$samba_cv_msghdr_msg_control" >&6; }
-if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
-+$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_CONTROL 1
-_ACEOF
-fi
-+# Add a system specific charset module.
-+ default_shared_modules="$default_shared_modules charset_macosxfs"
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$LINUX_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-#############################################
-# check for fd passing struct via msg_acctrights
@@ -38078,23 +38061,15 @@
-$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
-if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ ;;
-+ *hurd*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+ old_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+ if test "$cross_compiling" = yes; then :
-+ GLIBC_LFS_SUPPORT=cross
- else
--
+-else
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <sys/types.h>
-#include <stdlib.h>
@@ -38104,23 +38079,17 @@
-int
-main ()
-{
--
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+
- struct msghdr msg;
- int fd;
- msg.msg_acctrights = (caddr_t) &fd;
- msg.msg_acctrightslen = sizeof(fd);
--
+
- ;
- return 0;
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
- }
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38140,34 +38109,38 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_acctrights=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ GLIBC_LFS_SUPPORT=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
- samba_cv_msghdr_msg_acctrights=no
-+ GLIBC_LFS_SUPPORT=no
- fi
--
+-fi
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
++$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++ ;;
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5
-$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
-if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
--
++#
++# MacOS X is the *only* system that uses compose character in utf8. This
++# is so horribly broken....
++#
++ *darwin*)
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
-_ACEOF
++$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
-fi
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$GLIBC_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++# Add a system specific charset module.
++ default_shared_modules="$default_shared_modules charset_macosxfs"
-for ac_func in dirfd
-do
@@ -38176,38 +38149,43 @@
-$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
++ ;;
++ *hurd*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ GLIBC_LFS_SUPPORT=cross
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* 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 _GNU_SOURCE 1" >>confdefs.h
-#ifdef __STDC__
-# include <limits.h>
--#else
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
+ #else
-# include <assert.h>
-#endif
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
-+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
-+ ;;
-+ *qnx*)
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-
+-
-#undef $ac_func
-+$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
- builtin and then its argument prototype would still apply. */
@@ -38220,23 +38198,23 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
-+ ;;
-
++exit(1);
+ #endif
+-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
--}
--_ACEOF
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) 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
@@ -38253,17 +38231,22 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ GLIBC_LFS_SUPPORT=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
++ GLIBC_LFS_SUPPORT=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--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
@@ -38274,15 +38257,17 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
--
+
-fi
-done
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$GLIBC_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-if test x"$ac_cv_func_dirfd" = x"yes"; then
- default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-fi
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-{ $as_echo "$as_me:$LINENO: checking for struct sigevent type" >&5
-$as_echo_n "checking for struct sigevent type... " >&6; }
@@ -38296,7 +38281,18 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
++$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
++ ;;
++ *qnx*)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++ ;;
-#include <sys/types.h>
-#if STDC_HEADERS
@@ -38317,7 +38313,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -38334,30 +38330,36 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+
+- samba_cv_struct_sigevent=no
+-fi
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++echo "LIBREPLACE_BROKEN_CHECKS: START"
++
+libreplacedir=""
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
+for d in $libreplacepaths; do
+ if test -f "$d/replace.c"; then
+ libreplacedir="$d"
-
-- samba_cv_struct_sigevent=no
++
+ break;
+ fi
+done
+if test x"$libreplacedir" = "x"; then
+ as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
fi
-
--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="$libreplacedir/replace.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; }
@@ -38371,7 +38373,6 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <signal.h>
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
-int
-main ()
@@ -38402,19 +38403,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <sys/types.h>
@@ -38574,46 +38577,50 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5
+-$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; }
+-if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then
++$as_echo "#define uid_t int" >>confdefs.h
+
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-_ACEOF
-+$as_echo "#define uid_t int" >>confdefs.h
-
--fi
+$as_echo "#define gid_t int" >>confdefs.h
fi
+-fi
++ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
++if test "x$ac_cv_type_mode_t" = x""yes; then :
+
-{ $as_echo "$as_me:$LINENO: checking for struct timespec type" >&5
-$as_echo_n "checking for struct timespec type... " >&6; }
-if test "${samba_cv_struct_timespec+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
--
+ else
+
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define mode_t int
+ _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>
@@ -38629,8 +38636,10 @@
-# include <time.h>
-# endif
-#endif
-+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 :
++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 :
-int
-main ()
@@ -38666,7 +38675,7 @@
- samba_cv_struct_timespec=no
-fi
+cat >>confdefs.h <<_ACEOF
-+#define mode_t int
++#define off_t long int
+_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -38677,13 +38686,13 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_TIMESPEC 1
-+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-+if test "x$ac_cv_type_off_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
++#define size_t unsigned int
_ACEOF
fi
@@ -38695,8 +38704,8 @@
-if test "${samba_cv_have_setresuid+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
++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 :
- if test "$cross_compiling" = yes; then
- samba_cv_have_setresuid=cross
@@ -38711,7 +38720,7 @@
-main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
+
+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
++#define pid_t int
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -38748,14 +38757,15 @@
-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" "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_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 :
+
-+else
-+
+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
++#define HAVE_STRUCT_STAT_ST_RDEV 1
+_ACEOF
++
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
@@ -38764,16 +38774,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 HAVE_STRUCT_STAT_ST_RDEV 1
++#define ino_t unsigned
_ACEOF
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-+
fi
-# Do the same check for setresguid...
@@ -38783,12 +38793,11 @@
-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. */
@@ -38801,7 +38810,7 @@
-main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
+
+cat >>confdefs.h <<_ACEOF
-+#define ino_t unsigned
++#define loff_t off_t
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -38838,27 +38847,17 @@
-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" "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
++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 :
- 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
@@ -38936,28 +38935,50 @@
$as_echo "$ac_cv_func_memcmp_working" >&6; }
test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
*" memcmp.$ac_objext "* ) ;;
-@@ -37997,166 +8455,26 @@
+@@ -37997,317 +8455,154 @@
-###############################################
-# 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`
@@ -38983,7 +39004,15 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++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
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39006,14 +39035,20 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++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"
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39024,15 +39059,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39051,18 +39078,19 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_config_commands="$ac_config_commands mk-stdint.h"
++
- ac_header_preproc=no
fi
-+done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -39097,32 +39125,33 @@
-$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
++
++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
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++ ac_config_commands="$ac_config_commands mk-stdbool.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 stdbool.h stdint.h sys/select.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -38165,149 +8483,12 @@
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
- done
+ fi
--
+-done
+
+
-for ac_header in readline/history.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39131,7 +39160,19 @@
-$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_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_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -39146,7 +39187,10 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--$ac_includes_default
++
++
++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
+ $ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
@@ -39171,14 +39215,22 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
++
++"
++if test "x$ac_cv_type__Bool" = x""yes; then :
++
++$as_echo "#define HAVE__Bool 1" >>confdefs.h
+
- ac_header_compiler=no
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39187,9 +39239,20 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
++$as_echo_n "checking for working mmap... " >&6; }
++if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_MMAP=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++#include "$libreplacedir/test/shared_mmap.c"
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39208,17 +39271,28 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_MMAP=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ libreplace_cv_HAVE_MMAP=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
- ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
++$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
++if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -39255,17 +39329,31 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
++
++
++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
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_header in setjmp.h utime.h
++
++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"
@@ -39274,15 +39362,34 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -38317,474 +8498,97 @@
+@@ -38316,475 +8611,274 @@
+
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
-+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdint_h" = x""yes; then :
-+ ac_config_commands="$ac_config_commands rm-stdint.h"
++fi
--
++done
++
++for ac_header in 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
+
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39291,7 +39398,7 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -39302,13 +39409,33 @@
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++
++fi
++
++done
++
++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"
-case "(($ac_try" in
@@ -39328,29 +39455,50 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+ ac_config_commands="$ac_config_commands mk-stdint.h"
++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>
--_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
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39375,11 +39523,21 @@
- ac_header_preproc=no
fi
++done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++for ac_func in waitpid 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
- yes:no: )
@@ -39416,27 +39574,54 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++done
++
++for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
--fi
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++done
++
++for ac_func in isatty chown lchown link readlink symlink realpath
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
- for termlib in ncurses curses termcap terminfo termlib tinfo; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++fi
++done
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
++$as_echo_n "checking for setresuid declaration... " >&6; }
++if test "${ac_cv_have_setresuid_decl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${termlib} $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -39444,10 +39629,28 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdbool_h" = x""yes; then :
-+ ac_config_commands="$ac_config_commands rm-stdbool.h"
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#include <unistd.h>
++int
++main ()
++{
++int i = (int)setresuid
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresuid_decl=yes
++else
++ ac_cv_have_setresuid_decl=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
++$as_echo "$ac_cv_have_setresuid_decl" >&6; }
++ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -39456,14 +39659,29 @@
-extern "C"
-#endif
-char tgetent ();
--int
--main ()
--{
++$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 ()
+ {
-return tgetent ();
-- ;
-- return 0;
--}
--_ACEOF
++int i = (int)setresgid
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -39486,13 +39704,24 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresgid_decl=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"
++ 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
- eval "$as_ac_Lib=no"
-fi
++ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39507,14 +39736,17 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- TERMLIBS="-l${termlib}"; break
- fi
+-fi
- done
- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ { $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
@@ -39531,14 +39763,18 @@
-extern "C"
-#endif
-char rl_callback_handler_install ();
--int
--main ()
--{
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <errno.h>
+ int
+ main ()
+ {
-return rl_callback_handler_install ();
-- ;
-- return 0;
--}
--_ACEOF
++int i = (int)errno
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -39564,10 +39800,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_lib_readline_rl_callback_handler_install=no
-fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -39577,25 +39813,24 @@
-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
- TERMLIBS="-lreadline $TERMLIBS"
-+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
-+"
-+if test "x$ac_cv_type_bool" = x""yes; then :
-
+-
- break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_errno_decl=yes
+ else
- TERMLIBS=
--fi
-+$as_echo "#define HAVE_BOOL 1" >>confdefs.h
-
++ 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
-done
-
@@ -39617,9 +39852,11 @@
- LDFLAGS="-L$with_readline/lib $LDFLAGS"
- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-
--
++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
--
++ fi
+
+
-for ac_header in readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39627,7 +39864,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_n "(cached) " >&6
++{ $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
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -39643,8 +39883,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
- $ac_includes_default
+-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
@@ -39666,21 +39905,16 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-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; }
-+"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -39690,9 +39924,27 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++main() {
++ struct stat st;
++ char tpl[20]="/tmp/test.XXXXXX";
++ int fd = mkstemp(tpl);
++ if (fd == -1) exit(1);
++ unlink(tpl);
++ if (fstat(fd, &st) != 0) exit(1);
++ if ((st.st_mode & 0777) != 0600) exit(1);
++ exit(0);
++}
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39711,17 +39963,27 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_SECURE_MKSTEMP=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE__Bool 1" >>confdefs.h
++ 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
-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
@@ -39756,47 +40018,20 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$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
+- $as_echo_n "(cached) " >&6
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_MMAP=cross
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include "$libreplacedir/test/shared_mmap.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_MMAP=yes
-+else
-+ libreplace_cv_HAVE_MMAP=no
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
-+$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
-+if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
-+
-+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
- fi
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+
-+for ac_header in sys/syslog.h syslog.h
++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"
@@ -39805,7 +40040,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -38793,149 +8597,40 @@
+@@ -38793,1135 +8887,564 @@
done
@@ -39823,7 +40058,10 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
++ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
++ ac_have_decl=1
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -39835,14 +40073,11 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+for ac_header in sys/time.h time.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++ ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_SNPRINTF $ac_have_decl
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -39863,18 +40098,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
++ ac_have_decl=1
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
++ ac_have_decl=0
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+done
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -39885,14 +40123,8 @@
-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
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VSNPRINTF $ac_have_decl
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -39912,11 +40144,15 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
++ ac_have_decl=0
fi
-rm -f conftest.err conftest.$ac_ext
@@ -39957,44 +40193,47 @@
-$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
++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
- eval "$as_ac_Header=\$ac_header_preproc"
--fi
++ ac_have_decl=0
+ fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+done
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_header in sys/mount.h mntent.h
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VASPRINTF $ac_have_decl
++_ACEOF
++
++for ac_func in snprintf vsnprintf asprintf vasprintf
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -38944,733 +8639,569 @@
+ 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_header in readline.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40002,13 +40241,16 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
-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; }
@@ -40020,13 +40262,7 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+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
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -40046,49 +40282,62 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++
++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
+-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; }
-+done
++ va_start(ap, format);
++ len = vsnprintf(buf, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(1);
++
++ va_start(ap, format);
++ len = vsnprintf(0, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(2);
++
++ 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"); }
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+
-+for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+
-+fi
-+done
-+
-+for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -40108,26 +40357,27 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ 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
-+done
++{ $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; }
-+for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40170,47 +40420,23 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+done
-+
-+for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- fi
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in isatty chown lchown link readlink symlink realpath
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
- for termlib in ncurses curses termcap terminfo termlib; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
-+done
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
-+$as_echo_n "checking for setresuid declaration... " >&6; }
-+if test "${ac_cv_have_setresuid_decl+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
@@ -40229,14 +40455,15 @@
-extern "C"
-#endif
-char tgetent ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <unistd.h>
++#include <stdarg.h>
++va_list ap1,ap2;
int
main ()
{
-return tgetent ();
-+int i = (int)setresuid
++va_copy(ap1,ap2);
;
return 0;
}
@@ -40263,51 +40490,22 @@
- $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
++if ac_fn_c_try_link "$LINENO"; then :
++ libreplace_cv_HAVE_VA_COPY=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-+ ac_cv_have_setresuid_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ libreplace_cv_HAVE_VA_COPY=no
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)setresgid
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setresgid_decl=yes
-+else
-+ ac_cv_have_setresgid_decl=no
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
@@ -40317,24 +40515,22 @@
- $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
++{ $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:${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 :
++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
@@ -40353,14 +40549,15 @@
-extern "C"
-#endif
-char rl_callback_handler_install ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <errno.h>
++#include <stdarg.h>
++va_list ap1,ap2;
int
main ()
{
-return rl_callback_handler_install ();
-+int i = (int)errno
++__va_copy(ap1,ap2);
;
return 0;
}
@@ -40387,64 +40584,22 @@
- $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
++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_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
++ libreplace_cv_HAVE___VA_COPY=no
fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
@@ -40453,103 +40608,72 @@
- 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5
++$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; }
++if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
-+$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
++$as_echo "#define HAVE___VA_COPY 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
-
+-done
+-
+-
- 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
++{ $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
- { $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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++printf("%s\n", __FUNCTION__);
++ ;
++ return 0;
++}
+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
-+ ac_have_decl=1
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_FUNCTION_MACRO=yes
+else
-+ ac_have_decl=0
++ libreplace_cv_HAVE_FUNCTION_MACRO=no
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
-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-+done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
++if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
++$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
+
+-
+-
-# 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 :
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
++$as_echo_n "checking for __func__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -40559,12 +40683,7 @@
-_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. */
+-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -40573,44 +40692,17 @@
-extern "C"
-#endif
-char rl_completion_matches ();
--int
--main ()
--{
--return rl_completion_matches ();
-- ;
-- return 0;
-+#include <sys/types.h>
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.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);
+ int
+ main ()
+ {
+-return rl_completion_matches ();
++printf("%s\n", __func__);
+ ;
+ return 0;
}
-+main() { foo("hello"); }
-+
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -40634,46 +40726,66 @@
- $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
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_func_MACRO=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_readline_rl_completion_matches=no
-+ libreplace_cv_HAVE_C99_VSNPRINTF=no
++ libreplace_cv_HAVE_func_MACRO=no
+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
++ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
++$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
++
++ fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
-+$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
-+if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NEW_LIBREADLINE 1
--_ACEOF
-+$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
++for ac_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
-# 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 :
++
++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
++
++
++
++ { $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 >conftest.$ac_ext <<_ACEOF
@@ -40684,10 +40796,9 @@
-/* end confdefs.h. */
-#include <readline/readline.h>
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++#include <stdlib.h>
int
main ()
{
@@ -40695,7 +40806,7 @@
- (void) rl_event_hook;
-#endif
-
-+va_copy(ap1,ap2);
++int i = (int)setenv
;
return 0;
}
@@ -40719,49 +40830,55 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_rl_event_hook=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE_VA_COPY=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setenv_decl=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
++ 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_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5
-$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; }
-if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
++$as_echo "$ac_cv_have_setenv_decl" >&6; }
++ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
+
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 1
-_ACEOF
--
--
++$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
+
++ fi
+
-else
-- cat >>confdefs.h <<_ACEOF
++for ac_func in setenv unsetenv
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 0
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
-
+-
fi
++done
--
+
-{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
-$as_echo_n "checking for history_list in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_history_list+set}" = set; then
-+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 "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
++$as_echo_n "checking for environ declaration... " >&6; }
++if test "${ac_cv_have_environ_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
@@ -40780,15 +40897,14 @@
-extern "C"
-#endif
-char history_list ();
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <stdarg.h>
-+va_list ap1,ap2;
++#include <unistd.h>
int
main ()
{
-return history_list ();
-+__va_copy(ap1,ap2);
++int i = (int)environ
;
return 0;
}
@@ -40815,23 +40931,45 @@
- $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
++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
--
-- ac_cv_lib_readline_history_list=no
-+ libreplace_cv_HAVE___VA_COPY=no
++ ac_cv_have_environ_decl=no
+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5
++$as_echo "$ac_cv_have_environ_decl" >&6; }
++ if test x"$ac_cv_have_environ_decl" = x"yes"; then
++
++$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
++
++ fi
++
++
++for ac_func in strnlen
++do :
++ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
++if test "x$ac_cv_func_strnlen" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_STRNLEN 1
++_ACEOF
+
+- ac_cv_lib_readline_history_list=no
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
++done
+
-+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
++for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -40841,50 +40979,35 @@
-{ $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
++done
+
-+{ $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
++
++# 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");
-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
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
+
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
++rm -f conftest.err conftest.$ac_ext
-+$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h
-###############################################
-# test for where we get yp_get_default_domain() from
-{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
-$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
-+$as_echo_n "checking for __func__ macro... " >&6; }
-+if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
++$as_echo_n "checking for sig_atomic_t type... " >&6; }
++if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_func_search_save_LIBS=$LIBS
@@ -40893,23 +41016,27 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
--#endif
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
+ #endif
-char yp_get_default_domain ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
++#include <signal.h>
int
main ()
{
-return yp_get_default_domain ();
-+printf("%s\n", __func__);
++sig_atomic_t i = 0
;
return 0;
}
@@ -40943,357 +41070,55 @@
- $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
+-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
-
+-
+-
+-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
-+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
+-fi
+-done
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
- :
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_sig_atomic_t=yes
+ else
- ac_cv_search_yp_get_default_domain=no
--fi
++ libreplace_cv_sig_atomic_t=no
+ fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5
-$as_echo "$ac_cv_search_yp_get_default_domain" >&6; }
-ac_res=$ac_cv_search_yp_get_default_domain
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
--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 "$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_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
++$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
-
--# 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
-+
-+$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+
-+for ac_func in strnlen
-+do :
-+ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-+if test "x$ac_cv_func_strnlen" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRNLEN 1
-+_ACEOF
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+done
-+
-+for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -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
-
-+fi
-+rm -f conftest.err conftest.$ac_ext
-
-
--for ac_func in getcwd fchown chmod fchmod mknod mknod64
+-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 "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
-+$as_echo_n "checking for sig_atomic_t type... " >&6; }
-+if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
++$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
++if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -41318,7 +41143,7 @@
-#endif
-#undef $ac_func
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
@@ -41333,18 +41158,16 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
++#include <unistd.h>
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
#endif
-
-+#include <signal.h>
int
main ()
{
-return $ac_func ();
-+sig_atomic_t i = 0
++int fd = open("/dev/null", O_DIRECT);
;
return 0;
}
@@ -41372,13 +41195,13 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_sig_atomic_t=yes
++ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ libreplace_cv_sig_atomic_t=no
++ libreplace_cv_HAVE_OPEN_O_DIRECT=no
fi
-
-rm -rf conftest.dSYM
@@ -41396,25 +41219,27 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5
-+$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
-+if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
-+
-+$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
++$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
++if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
- fi
+-fi
-done
++$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
++fi
--for ac_func in strtol
+-# 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 O_DIRECT flag to open(2)" >&5
-+$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
-+if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
++$as_echo_n "checking that the C compiler understands volatile... " >&6; }
++if test "${libreplace_cv_volatile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -41431,7 +41256,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
@@ -41439,9 +41264,7 @@
-#endif
-
-#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -41454,16 +41277,16 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#include <unistd.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
- #endif
--
+-#endif
+
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
int
main ()
{
-return $ac_func ();
-+int fd = open("/dev/null", O_DIRECT);
++volatile int i = 0
;
return 0;
}
@@ -41491,13 +41314,13 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
++ libreplace_cv_volatile=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=no
++ libreplace_cv_volatile=no
fi
-
-rm -rf conftest.dSYM
@@ -41515,26 +41338,37 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
-+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
-+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
++$as_echo "$libreplace_cv_volatile" >&6; }
++if test x"$libreplace_cv_volatile" = x"yes"; then
-fi
-done
-+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
++$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
-+fi
+-if test x"$ac_cv_func_execl" = x"no"; then
+- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
+ fi
-
--for ac_func in strchr chflags
+-
+-
+-
+-
+-
+-
+-for ac_func in getcwd fchown chmod fchmod mknod mknod64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
-+$as_echo_n "checking that the C compiler understands volatile... " >&6; }
-+if test "${libreplace_cv_volatile+set}" = set; then :
++# filesys
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -41542,47 +41376,25 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+volatile int i = 0
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_volatile=yes
-+else
-+ libreplace_cv_volatile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
-+$as_echo "$libreplace_cv_volatile" >&6; }
-+if test x"$libreplace_cv_volatile" = x"yes"; then
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
-
+-
-#undef $ac_func
-+fi
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -41596,17 +41408,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+# filesys
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+#include <sys/types.h>
+#include <$ac_hdr>
@@ -41676,12 +41477,9 @@
+ac_header_dirent=$ac_hdr; break
fi
-done
--
--
-
--
--for ac_func in getrlimit fsync fdatasync setpgid
+-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
@@ -41722,7 +41520,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40135,104 +9452,56 @@
+@@ -39929,101 +9452,56 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -41819,10 +41617,7 @@
+fi
--
--
--
--for ac_func in setsid glob strpbrk crypt16 getauthuid
+-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
@@ -41861,7 +41656,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40240,170 +9509,148 @@
+@@ -40031,166 +9509,148 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -41982,21 +41777,7 @@
+done
-+# select
-+for ac_header in sys/select.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_select_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SELECT_H 1
-+_ACEOF
-
-+fi
-
-+done
-
-
--for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+-for ac_func in 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
@@ -42006,15 +41787,13 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# time
-+for ac_header in sys/time.h utime.h
++# select
++for ac_header in sys/select.h
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_select_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_SELECT_H 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -42022,21 +41801,21 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+fi
++done
-#undef $ac_func
-+done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42051,6 +41830,21 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++# time
++for ac_header in sys/time.h utime.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then :
@@ -42069,9 +41863,9 @@
+if ((struct tm *) 0)
+return 0;
;
- return 0;
- }
- _ACEOF
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -42094,6 +41888,9 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_time=yes
else
@@ -42132,7 +41929,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -40412,426 +9659,311 @@
+@@ -40199,425 +9659,311 @@
done
@@ -42140,9 +41937,7 @@
-
-
-
--
--
--for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+-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
@@ -42272,11 +42067,10 @@
_ACEOF
fi
--done
++
+ done
-+done
-
+case "$host_os" in
+*linux*)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RedHat 7.2 system header files" >&5
@@ -42284,10 +42078,10 @@
+if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-
++
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
++
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
@@ -42301,57 +42095,61 @@
+ int i;
--for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
++else
++ libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
+
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
++$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
++if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
+
++$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
+
++fi
+
+-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
++{ $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 >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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&5
-+$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; }
-+if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h
-+
-+fi
-#undef $ac_func
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
-+$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
-+if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42366,9 +42164,6 @@
-#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_CAPABILITY_H
+ #include <sys/capability.h>
+ #endif
@@ -42451,9 +42246,13 @@
_ACEOF
fi
-+
- done
+-done
+-
+-
+-
++done
+
+for ac_func in getpwnam_r getpwuid_r getpwent_r
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -42468,50 +42267,15 @@
+done
-+ { $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
+-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
-+ 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 "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
++$as_echo_n "checking for getpwent_r declaration... " >&6; }
++if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -42519,29 +42283,25 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ $ac_includes_default
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ #include <unistd.h>
-+ #include <pwd.h>
-#undef $ac_func
-+ struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)
-+ {
++ 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
@@ -42556,20 +42316,17 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifndef HAVE_GETPWENT_R_DECL
-+ #error missing getpwent_r prototype
-+ #endif
-+ return NULL;
-+
-+ }
++ #include <unistd.h>
++ #include <pwd.h>
--int
--main ()
--{
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
++int i = (int)getpwent_r
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42594,20 +42351,19 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
-+
++ ac_cv_have_getpwent_r_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
--fi
-+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
-
++ ac_cv_have_getpwent_r_decl=no
+ fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -42618,13 +42374,52 @@
- 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
++{ $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 :
- fi
+-fi
-done
--
--
++ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
+
++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 :
@@ -42633,14 +42428,14 @@
+$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
-+fi
-
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-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
++fi
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5
+$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)... " >&6; }
+if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
@@ -42670,11 +42465,16 @@
-#endif
+ #include <unistd.h>
+ #include <pwd.h>
-
--#undef $ac_func
++
+ struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)
+ {
+-#undef $ac_func
++ #ifndef HAVE_GETPWENT_R_DECL
++ #error missing getpwent_r prototype
++ #endif
++ return NULL;
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -42688,11 +42488,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifndef HAVE_GETPWENT_R_DECL
-+ #error missing getpwent_r prototype
-+ #endif
-+ return NULL;
-+
+ }
-int
@@ -42769,7 +42564,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -40840,347 +9972,221 @@
+@@ -40626,255 +9972,221 @@
done
@@ -42806,14 +42601,15 @@
+$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
--for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
++ fi
+
+-
+-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 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 :
@@ -42909,22 +42705,11 @@
- eval "$as_ac_var=no"
-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
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -42935,12 +42720,23 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-done
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
++$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
++if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
--for ac_func in getpwent_r
++$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
+
+
++fi
+
+
+-for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -43041,20 +42837,10 @@
- eval "$as_ac_var=no"
+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=no
+
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--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
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5
+$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; }
+if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then :
@@ -43069,25 +42855,14 @@
+do :
+ 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
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_GETGROUPLIST 1
- _ACEOF
-
- fi
- done
-
-
--for ac_func in getdents64
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
++_ACEOF
++
++fi
++done
++
++
+# locale
+for ac_header in ctype.h locale.h langinfo.h
+do :
@@ -43097,50 +42872,16 @@
+ 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. */
++_ACEOF
++
+ fi
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
-
--#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
+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 :
@@ -43148,40 +42889,9 @@
+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"
++_ACEOF
++
fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -43189,6 +42899,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
+done
+
+
@@ -43219,56 +42930,56 @@
+ 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
+
+
++save_LIBS="$LIBS"
++LIBS=""
+
+-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_n "(cached) " >&6
--else
++libreplace_cv_dlfcn=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
++$as_echo_n "checking for library containing dlopen... " >&6; }
++if test "${ac_cv_search_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+save_LIBS="$LIBS"
-+LIBS=""
-
+-
-#undef $ac_func
-+libreplace_cv_dlfcn=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-+$as_echo_n "checking for library containing dlopen... " >&6; }
-+if test "${ac_cv_search_dlopen+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -41188,102 +10194,85 @@
+@@ -40882,100 +10194,85 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -43312,9 +43023,6 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+for ac_lib in '' dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -43332,23 +43040,36 @@
+fi
+done
+if test "${ac_cv_search_dlopen+set}" = set; then :
-
-- eval "$as_ac_var=no"
-+else
++
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+- eval "$as_ac_var=no"
+ fi
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++
++for ac_header in dlfcn.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DLFCN_H 1
++_ACEOF
++
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43358,37 +43079,25 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
++done
+
-+for ac_header in dlfcn.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DLFCN_H 1
- _ACEOF
-
- fi
-+
- done
-
+for ac_func in dlopen dlsym dlerror dlclose
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+else
+ libreplace_cv_dlfcn=yes
-+fi
-+done
+ fi
+ done
--for ac_func in syslog vsyslog timegm
+-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
@@ -43427,7 +43136,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -41291,966 +10280,612 @@
+@@ -40983,1172 +10280,612 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -43544,8 +43253,7 @@
done
--
--for ac_func in setlocale nl_langinfo
+-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
@@ -43640,10 +43348,8 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- 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 \
@@ -43659,19 +43365,20 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-done
+-
+-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5
+$as_echo "$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; }
+if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then :
-+
-+
-+$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
-+
- fi
--done
++$as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
--for ac_func in nanosleep
+-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
@@ -43688,27 +43395,22 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+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"
++fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+LIBS="$save_LIBS"
-#undef $ac_func
-+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
++if test x"${libreplace_cv_dlfcn}" = x"yes";then
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
+fi
-/* Override any GCC internal prototype to avoid an error.
@@ -43724,32 +43426,130 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++LIBDL="$LIBS"
+
+-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
++LIBS="$save_LIBS"
+
+- eval "$as_ac_var=no"
++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
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+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
+-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
+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
-+
+
+-for ac_func in syslog vsyslog timegm
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
-+else
-+
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
+$as_echo_n "checking whether getpass should be replaced... " >&6; }
+if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-+
+
+-#undef $ac_func
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+-/* 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 "confdefs.h"
+#define NO_CONFIG_H
+#include "$libreplacedir/getpass.c"
@@ -43790,23 +43590,16 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+ libreplace_cv_REPLACE_GETPASS=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CPPFLAGS="$SAVE_CPPFLAGS"
-- eval "$as_ac_var=no"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
-+$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
-+if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
-+
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43818,46 +43611,136 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
++$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; }
++if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
+-fi
+-done
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
+
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
+fi
-+
+
++fi
+
+-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 "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5
+$as_echo_n "checking whether strptime is available and works... " >&6; }
+if test "${libreplace_cv_STRPTIME_OK+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
+ $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
+ if test "$cross_compiling" = yes; then :
+ libreplace_cv_STRPTIME_OK="assuming not"
+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 $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
+ #define LIBREPLACE_CONFIGURE_TEST_STRPTIME
+ #include "$libreplacedir/test/strptime.c"
-+
-+_ACEOF
+
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_STRPTIME_OK=yes
else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ libreplace_cv_STRPTIME_OK=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
++
-
-+fi
+- eval "$as_ac_var=no"
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5
+$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
+if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
-+
-+$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lrt $LIBS $LIBS"
+-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_STRPTIME 1" >>confdefs.h
++
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+
+for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
+do :
@@ -43865,18 +43748,22 @@
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
-+fi
+ fi
++
+ done
-+done
-
-- { $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
+-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
+#######################################
+# Check for mkdir mode
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
@@ -43891,14 +43778,37 @@
-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 nanosleep ();
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+
+ #include <stdio.h>
+ #ifdef HAVE_DIRECT_H
+ #include <direct.h>
@@ -43906,7 +43816,7 @@
int
main ()
{
--return nanosleep ();
+-return $ac_func ();
+
+ mkdir("foo",0777);
+ return 0;
@@ -43936,16 +43846,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ext_rt_nanosleep=yes;
-- ac_cv_lib_ext_rt=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ libreplace_cv_mkdir_has_mode="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
+- eval "$as_ac_var=no"
+ libreplace_cv_mkdir_has_mode="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -43955,50 +43863,44 @@
+
+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
--{ $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
+-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 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 HAVE_NANOSLEEP 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_TIMEGM 1
_ACEOF
-+else
+ else
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
- fi
++fi
+done
--LIBS=$ac_check_lib_ext_save_LIBS
--if test $ac_cv_lib_ext_rt = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRT 1
--_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
+$as_echo_n "checking for broken readdir... " >&6; }
+if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-- case "$LIBS" in
-- *-lrt*)
-- ;;
-- *)
-- LIBS="-lrt $LIBS"
-- ;;
-- esac
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS $LIBS"
+ if test "$cross_compiling" = yes; then :
+ libreplace_cv_READDIR_NEEDED="assuming not"
+else
@@ -44018,7 +43920,7 @@
+fi
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
+$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
+
@@ -44029,17 +43931,14 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DIRFD 1
+_ACEOF
++
++fi
++done
- 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 "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
+-$as_echo_n "checking for nanosleep in -lrt... " >&6; }
+-if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then
+ { $as_echo "$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 :
@@ -44051,44 +43950,21 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-
+-char nanosleep ();
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <dirent.h>
int
main ()
{
--return $ac_func ();
+-return nanosleep ();
+int i = (int)dirfd
;
return 0;
@@ -44115,43 +43991,43 @@
- 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 :
+ ac_cv_have_dirfd_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
+- ac_cv_lib_ext_rt_nanosleep=no;
+- ac_cv_lib_ext_rt=no
+ ac_cv_have_dirfd_decl=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
+-$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
+- if test $ac_cv_lib_ext_rt_nanosleep = yes; then
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_NANOSLEEP 1
-_ACEOF
+{ $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
+-LIBS=$ac_check_lib_ext_save_LIBS
+-if test $ac_cv_lib_ext_rt = yes; then
+#
+# try to replace with getdirentries() if needed
+#
@@ -44160,14 +44036,27 @@
+do :
+ ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
+if test "x$ac_cv_func_getdirentries" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
+#define HAVE_GETDIRENTRIES 1
-+_ACEOF
+ _ACEOF
-+fi
-+done
+- case "$LIBS" in
+- *-lrt*)
+- ;;
+- *)
+- LIBS="-lrt $LIBS"
+- ;;
+- esac
+-
+-
+-fi
+-
+ fi
+ done
--for ac_func in mlock munlock mlockall munlockall
+-
+-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
@@ -44291,15 +44180,15 @@
+$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
--for ac_func in memalign posix_memalign hstrerror
++fi
+
+-for ac_func in mlock munlock mlockall munlockall
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+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 :
@@ -44415,6 +44304,155 @@
+if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
++$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
+
+
+-for ac_func in 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 replacing readdir using getdirentries()" >&5
++$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* 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;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++#define _LIBREPLACE_REPLACE_H
++#include "$libreplacedir/repdir_getdirentries.c"
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_READDIR_GETDIRENTRIES=yes
++else
++ libreplace_cv_READDIR_GETDIRENTRIES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
++$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
++fi
++if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
+
+-/* 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 "#define REPLACE_READDIR 1" >>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"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
+-fi
++$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
++ libreplace_cv_READDIR_NEEDED=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
++
++#
++# try to replace with getdents() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdents
++do :
++ ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
++if test "x$ac_cv_func_getdents" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETDENTS 1
+ _ACEOF
+
+ fi
+ done
+
+-
-for ac_header in sys/mman.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44422,13 +44460,16 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
++$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $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; }
@@ -44437,10 +44478,24 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ if test "$cross_compiling" = yes; then :
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++
++#define _LIBREPLACE_REPLACE_H
++#error _donot_use_getdents_replacement_anymore
++#include "$libreplacedir/repdir_getdents.c"
++#define test_readdir_os2_delete main
++#include "$libreplacedir/test/os2_delete.c"
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -44460,23 +44515,29 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_READDIR_GETDENTS=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
-+
++ libreplace_cv_READDIR_GETDENTS=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
- ac_header_compiler=no
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5
++$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
fi
++if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
-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
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -44486,21 +44547,9 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ if test "$cross_compiling" = yes; then :
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#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;;
@@ -44519,22 +44568,20 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_READDIR_GETDIRENTRIES=yes
- else
+-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
++$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
++ libreplace_cv_READDIR_NEEDED=no
++fi
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -44570,45 +44617,40 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking a usable readdir()" >&5
++$as_echo_n "checking a usable readdir()... " >&6; }
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the provided readdir() is broken" >&5
++$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
-+fi
-+if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
-+
-+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
-+
-+$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
-+
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
-+ libreplace_cv_READDIR_NEEDED=no
- fi
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+#
-+# try to replace with getdents() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+for ac_func in getdents
++###############################################
++# test for where we get crypt() from
++for ac_header in crypt.h
+do :
-+ ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
-+if test "x$ac_cv_func_getdents" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
++if test "x$ac_cv_header_crypt_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_GETDENTS 1
++#define HAVE_CRYPT_H 1
_ACEOF
fi
--
+
done
-# setbuffer, shmget, shm_open are needed for smbtorture
@@ -44620,9 +44662,9 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
-+$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
-+if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
++$as_echo_n "checking for library containing crypt... " >&6; }
++if test "${ac_cv_search_ext_crypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -44630,15 +44672,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ if test "$cross_compiling" = yes; then :
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* 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
@@ -44647,40 +44681,25 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+#define _LIBREPLACE_REPLACE_H
-+#error _donot_use_getdents_replacement_anymore
-+#include "$libreplacedir/repdir_getdents.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_READDIR_GETDENTS=yes
-+else
-+ libreplace_cv_READDIR_GETDENTS=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
+-
-#undef $ac_func
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5
-+$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; }
-+fi
-+if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
++ac_func_search_ext_save_LIBS=$LIBS
++ac_cv_search_ext_crypt=no
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -42156,101 +10893,25 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -44688,16 +44707,17 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
-
--int
--main ()
--{
+-
++char crypt ();
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++return crypt ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -44723,28 +44743,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
-+$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
-+
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
-+ libreplace_cv_READDIR_NEEDED=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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking a usable readdir()" >&5
-+$as_echo_n "checking a usable readdir()... " >&6; }
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the provided readdir() is broken" >&5
-+$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;}
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44752,41 +44758,37 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+###############################################
-+# test for where we get crypt() from
-+for ac_header in crypt.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-+if test "x$ac_cv_header_crypt_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CRYPT_H 1
- _ACEOF
-
+-_ACEOF
+-
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_ext_crypt="none required"
fi
-done
-
-
-+done
-
+-
+-
-for ac_func in gettext dgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
-+$as_echo_n "checking for library containing crypt... " >&6; }
-+if test "${ac_cv_search_ext_crypt+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $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. */
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_ext_crypt" = no; then
++ for ac_lib in crypt; do
++ LIBS="-l$ac_lib $CRYPT_LIBS $ac_func_search_save_ext_LIBS"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -44795,7 +44797,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
@@ -44803,14 +44805,10 @@
-#endif
-
-#undef $ac_func
-+ac_func_search_ext_save_LIBS=$LIBS
-+ac_cv_search_ext_crypt=no
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -42258,101 +10893,25 @@
+@@ -42258,1278 +10919,665 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44859,12 +44857,29 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
--
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_ext_crypt="-l$ac_lib"
++break
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ done
++fi
++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"
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
++
++else
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o"
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -44872,17 +44887,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
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_ext_crypt="none required"
++
++
++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
+
++else
++ as_fn_error "Required function not found" "$LINENO" 5
fi
--done
--
--
--
+ done
+
+
++echo "LIBREPLACE_BROKEN_CHECKS: END"
+
-for ac_func in bindtextdomain textdomain
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -44896,13 +44920,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_ext_crypt" = no; then
-+ for ac_lib in crypt; do
-+ LIBS="-l$ac_lib $CRYPT_LIBS $ac_func_search_save_ext_LIBS"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -44919,13 +44937,13 @@
-#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
-@@ -42360,1176 +10919,665 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -44934,16 +44952,14 @@
-choke me
-#endif
-
-+char crypt ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return $ac_func ();
-+return crypt ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -44966,38 +44982,15 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_ext_crypt="-l$ac_lib"
-+break
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ done
-+fi
-+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
+-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
++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 HAVE_SYSLOG 1
+_ACEOF
- eval "$as_ac_var=no"
@@ -45018,22 +45011,29 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
-+echo "LIBREPLACE_BROKEN_CHECKS: END"
++echo "LIBREPLACE_NETWORK_CHECKS: START"
+
-+for ac_func in syslog
++
++$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
++
++LIBREPLACE_NETWORK_OBJS=""
++LIBREPLACE_NETWORK_LIBS=""
++
++for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
+do :
-+ ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
-+if test "x$ac_cv_func_syslog" = 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_SYSLOG 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-+else
-+ as_fn_error "Required function not found" "$LINENO" 5
fi
- done
+-done
++done
-for ac_func in strupr
-do
@@ -45045,22 +45045,12 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+echo "LIBREPLACE_NETWORK_CHECKS: START"
-+
-+
-+$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
-+
-+LIBREPLACE_NETWORK_OBJS=""
-+LIBREPLACE_NETWORK_LIBS=""
-+
-+for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
++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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -45068,28 +45058,21 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
++fi
-#undef $ac_func
-+for ac_header in netinet/in_systm.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETINET_IN_SYSTM_H 1
-+_ACEOF
++done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -45104,17 +45087,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+fi
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
-+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" "
@@ -45125,7 +45097,14 @@
+ #ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+ #endif
-+
+
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+"
+if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
@@ -45524,13 +45503,13 @@
- conftest$ac_exeext
- if test "${ac_cv_search_backtrace_symbols+set}" = set; then
- break
- fi
+-fi
-done
-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
- :
-else
- ac_cv_search_backtrace_symbols=no
--fi
+ fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
@@ -46338,14 +46317,14 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBUNWIND 1
-_ACEOF
--
+if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_UNIXSOCKET=yes
+
- # 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
-
+-
-for ac_header in libunwind-ptrace.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -46359,7 +46338,7 @@
- $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; }
@@ -46391,7 +46370,7 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -46534,7 +46513,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -43538,349 +11586,131 @@
+@@ -43538,349 +11586,197 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -46608,33 +46587,15 @@
-
-else
- LIBUNWIND_PTRACE=""
--fi
--
--
-- LIBS=$save_LIBS
--
--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; }
-- LIBS=$save_LIBS
--
fi
+LIBS=$ac_check_lib_ext_save_LIBS
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+if test $ac_cv_lib_ext_nsl_s = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL_S 1
+_ACEOF
--# To use libunwind-ptrace, we also need to make some ptrace system calls.
--if test x"$LIBUNWIND_PTRACE" != x"" ; then
+- LIBS=$save_LIBS
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl_s*)
+ ;;
@@ -46643,6 +46604,27 @@
+ ;;
+ esac
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
++fi
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- LIBS=$save_LIBS
+
+-fi
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+
+-# To use libunwind-ptrace, we also need to make some ptrace system calls.
+-if test x"$LIBUNWIND_PTRACE" != x"" ; then
+
-for ac_header in sys/ptrace.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -46650,13 +46632,16 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
-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; }
@@ -46665,10 +46650,26 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char connect ();
++int
++main ()
++{
++return connect ();
++ ;
++ return 0;
++}
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -46688,16 +46689,32 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ext_nsl_connect=yes;
++ ac_cv_lib_ext_nsl=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_lib_ext_nsl_connect=no;
++ ac_cv_lib_ext_nsl=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
- ac_header_compiler=no
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
++$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
++ if test $ac_cv_lib_ext_nsl_connect = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
++fi
++LIBS=$ac_check_lib_ext_save_LIBS
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -46709,7 +46726,10 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++if test $ac_cv_lib_ext_nsl = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46731,11 +46751,16 @@
-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
++ case "$LIBREPLACE_NETWORK_LIBS" in
++ *-lnsl*)
++ ;;
++ *)
++ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++ ;;
++ esac
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -46774,18 +46799,15 @@
-{ $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
+- $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"'`
@@ -46793,11 +46815,13 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
--
+
-fi
--
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
+
-done
--
+
- { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
-$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
@@ -46805,6 +46829,12 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -46866,8 +46896,8 @@
-
-
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_nsl_connect=yes;
-+ ac_cv_lib_ext_nsl=yes
++ ac_cv_lib_ext_socket_connect=yes;
++ ac_cv_lib_ext_socket=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -46877,8 +46907,8 @@
-$as_echo "no" >&6; }
- LIBUNWIND_PTRACE=""
-
-+ ac_cv_lib_ext_nsl_connect=no;
-+ ac_cv_lib_ext_nsl=no
++ ac_cv_lib_ext_socket_connect=no;
++ ac_cv_lib_ext_socket=no
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
@@ -46887,9 +46917,9 @@
-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; }
-+ if test $ac_cv_lib_ext_nsl_connect = 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 HAVE_CONNECT 1
+_ACEOF
@@ -46897,16 +46927,16 @@
+fi
+LIBS=$ac_check_lib_ext_save_LIBS
-+if test $ac_cv_lib_ext_nsl = yes; then :
++if test $ac_cv_lib_ext_socket = yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
++#define HAVE_LIBSOCKET 1
+_ACEOF
+ case "$LIBREPLACE_NETWORK_LIBS" in
-+ *-lnsl*)
++ *-lsocket*)
+ ;;
+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
@@ -46915,7 +46945,7 @@
+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
++LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS"
@@ -46925,9 +46955,9 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-+$as_echo_n "checking for connect in -lsocket... " >&6; }
-+if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
++ { $as_echo "$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 >conftest.$ac_ext <<_ACEOF
@@ -46956,7 +46986,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -43888,106 +11718,65 @@
+@@ -43888,106 +11784,88 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47001,148 +47031,6 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ext_socket_connect=yes;
-+ ac_cv_lib_ext_socket=yes
- 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
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--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_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_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*)
-+ ;;
-+ *)
-+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
-+ ;;
-+ esac
-
-
-+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. */
-
- /* 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 ()
- {
--return $ac_func ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_inet_connect=yes;
+ ac_cv_lib_ext_inet=yes
else
@@ -47153,35 +47041,23 @@
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
-- eval "$as_ac_var=no"
- fi
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5
+$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
+ if test $ac_cv_lib_ext_inet_connect = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_CONNECT 1
+_ACEOF
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- 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
++
++fi
+LIBS=$ac_check_lib_ext_save_LIBS
+
+if test $ac_cv_lib_ext_inet = yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBINET 1
- _ACEOF
-
++_ACEOF
++
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-linet*)
+ ;;
@@ -47190,76 +47066,90 @@
+ ;;
+ esac
+
-+
+
+- eval "$as_ac_var=no"
fi
--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
-
++
+$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
-+fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
++for ac_func in gethostbyname
++do :
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETHOSTBYNAME 1
+ _ACEOF
--for ac_func in __getcwd _getcwd
+ fi
+ done
+
++if test x"$ac_cv_func_gethostbyname" = x"no"; then
+
+
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS $LIBS"
+
+
+
+-
+-
+-for ac_func in __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
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
++$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in gethostbyname
-+do :
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETHOSTBYNAME 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-+done
-+
-+if test x"$ac_cv_func_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"
-+
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44097,102 +11873,65 @@
+@@ -43995,101 +11873,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47359,14 +47249,14 @@
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
-
--for ac_func in __xstat __fxstat __lxstat
+-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 "$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 :
@@ -47398,7 +47288,7 @@
/* 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 @@
+@@ -44097,102 +11939,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47448,14 +47338,21 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ ac_cv_lib_ext_nsl_gethostbyname=no;
+ ac_cv_lib_ext_nsl=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- eval "$as_ac_var=no"
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
++ if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETHOSTBYNAME 1
++_ACEOF
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47467,23 +47364,14 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
-+ if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETHOSTBYNAME 1
- _ACEOF
-
- fi
--done
+LIBS=$ac_check_lib_ext_save_LIBS
+
+if test $ac_cv_lib_ext_nsl = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBNSL 1
-+_ACEOF
-+
+ _ACEOF
+
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl*)
+ ;;
@@ -47491,17 +47379,18 @@
+ LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
++
++
+ fi
+-done
-+fi
-
-
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS"
++
-
--for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+-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
@@ -47538,7 +47427,7 @@
/* 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 @@
+@@ -44200,105 +12005,87 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47588,21 +47477,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_gethostbyname=no;
+ ac_cv_lib_ext_socket=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- eval "$as_ac_var=no"
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
-+ if test $ac_cv_lib_ext_socket_gethostbyname = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETHOSTBYNAME 1
-+_ACEOF
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47614,14 +47496,23 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_socket = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; }
++ if test $ac_cv_lib_ext_socket_gethostbyname = yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBSOCKET 1
++#define HAVE_GETHOSTBYNAME 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*)
+ ;;
@@ -47629,10 +47520,9 @@
+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-+
-+
- fi
--done
+
+
++fi
+ if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
+ test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" ||
+ test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes"
@@ -47643,63 +47533,62 @@
+ fi
+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 HAVE_IF_NAMETOINDEX 1
-+_ACEOF
-
-+fi
-+done
-
-+if test x"$ac_cv_func_if_nametoindex" = x"no"; then
-
-
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
-
-
--for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+-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 if_nametoindex in -lipv6" >&5
-+$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
-+if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in if_nametoindex
++do :
++ ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
++if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_IF_NAMETOINDEX 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++fi
++done
++
++if test x"$ac_cv_func_if_nametoindex" = x"no"; then
++
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
++$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
++if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44414,2644 +12093,2283 @@
+@@ -44306,2760 +12093,2283 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47779,7 +47668,7 @@
fi
-done
+LIBS=$ac_check_lib_ext_save_LIBS
-+
+
+if test $ac_cv_lib_ext_ipv6 = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBIPV6 1
@@ -47809,52 +47698,58 @@
+libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir"
--for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
++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
+
+-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_n "(cached) " >&6
--else
+ 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
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
++fi
++done
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
-+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
--#undef $ac_func
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken inet_ntoa" >&5
+$as_echo_n "checking for broken inet_ntoa... " >&6; }
+if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+-#undef $ac_func
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_REPLACE_INET_NTOA=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -47867,13 +47762,14 @@
- 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. */
-
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
+ #endif
+-
-int
-main ()
-{
@@ -47881,13 +47777,6 @@
- ;
- return 0;
-}
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
+main() { struct in_addr ip; ip.s_addr = 0x12345678;
+if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
+ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
@@ -47957,7 +47846,7 @@
done
+if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
-+
+
+$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
@@ -47977,6 +47866,13 @@
+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
+for ac_func in inet_ntop
+do :
+ ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
@@ -47984,14 +47880,7 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_INET_NTOP 1
+_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. */
@@ -48107,35 +47996,17 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_HAVE_GETADDRINFO=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
-+$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
-+if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
-
+-
- 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
-+
-+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
++ 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
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -48143,69 +48014,67 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_header in ifaddrs.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_IFADDRS_H 1
- _ACEOF
+-_ACEOF
++{ $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
- fi
-+
- done
+-fi
+-done
++$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
-+ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
-+"
-+if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
++$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
-+_ACEOF
++$as_echo "#define HAVE_FREEADDRINFO 1" >>confdefs.h
-+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
--for ac_func in getdirentries _write __write _fork __fork
++$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
+
+-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
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
++fi
++
++for ac_header in ifaddrs.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
++if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_IFADDRS_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
-+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
-+{ $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
++done
-#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48219,12 +48088,35 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
+-#endif
++ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
++"
++if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
++_ACEOF
++
++
++$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
++$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
++if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
- #endif
--
++#endif
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
@@ -48273,25 +48165,13 @@
-
- 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"'`
@@ -48302,22 +48182,56 @@
- 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
+
+
++$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
+
++fi
+
+-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
+##################
+# look for a method of finding the list of network interfaces
+iface=no;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface getifaddrs" >&5
+$as_echo_n "checking for iface getifaddrs... " >&6; }
+if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+#define HAVE_IFACE_GETIFADDRS 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48328,7 +48242,7 @@
+#include "$libreplacedir/getifaddrs.c"
+#define getifaddrs_test main
+#include "$libreplacedir/test/getifaddrs.c"
- _ACEOF
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=yes
+else
@@ -48338,32 +48252,83 @@
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
- fi
--done
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
+$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
+if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_GETIFADDRS 1" >>confdefs.h
-+
+
+-#undef $ac_func
+else
+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
+fi
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+if test $iface = no; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5
+$as_echo_n "checking for iface AIX... " >&6; }
+if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-+else
-+
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_AIX=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
++
+#define HAVE_IFACE_AIX 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48383,40 +48348,46 @@
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+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
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_AIX" >&5
+$as_echo "$libreplace_cv_HAVE_IFACE_AIX" >&6; }
+if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_AIX 1" >>confdefs.h
+ 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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+
++ $as_echo_n "(cached) " >&6
++else
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_IFCONF=cross
+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
@@ -48427,9 +48398,7 @@
+#include "$libreplacedir/getifaddrs.c"
+#define getifaddrs_test main
+#include "$libreplacedir/test/getifaddrs.c"
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_HAVE_IFACE_IFCONF=yes
+else
@@ -48438,23 +48407,34 @@
+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 _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 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
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_IFREQ=cross
@@ -49037,20 +49017,6 @@
+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"
@@ -49084,7 +49050,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
++
++
++## 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
++
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -49092,6 +49070,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
+done
+
+
@@ -49304,8 +49283,7 @@
-# include <assert.h>
-#endif
+done
-
--#undef $ac_func
++
+for ac_header in syscall.h sys/syscall.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -49316,6 +49294,9 @@
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+-#undef $ac_func
++fi
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -49329,7 +49310,7 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+fi
++done
-int
-main ()
@@ -49338,9 +49319,7 @@
- ;
- return 0;
-}
-+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`
@@ -49422,11 +49401,10 @@
-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 ()
@@ -49454,11 +49432,17 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+done
++fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRCTL 1
-+
+-_ACEOF
++done
+
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+# For experimental utmp support (lastlog on some BSD-like systems)
+for ac_header in utmp.h utmpx.h lastlog.h
+do :
@@ -49468,18 +49452,23 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
++_ACEOF
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
--fi
-
--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
+- { $as_echo "$as_me:$LINENO: checking for good getgrouplist" >&5
+-$as_echo_n "checking for good getgrouplist... " >&6; }
+-if test "${samba_cv_linux_getgrouplist_ok+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]];'.
@@ -49487,17 +49476,9 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-
--#
--#
--#
--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_n "(cached) " >&6
+ else
+- 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
@@ -49505,6 +49486,8 @@
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
++
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -49522,10 +49505,6 @@
+ 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>
@@ -49534,6 +49513,9 @@
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
- int libc_major = __GLIBC__;
- int libc_minor = __GLIBC_MINOR__;
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
++$as_echo "$ac_cv_sizeof_int" >&6; }
- if (libc_major < 2)
- exit(1);
@@ -49543,6 +49525,7 @@
- exit(0);
-}
++
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
_ACEOF
@@ -49568,7 +49551,7 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- linux_getgrouplist_ok=yes
+- samba_cv_linux_getgrouplist_ok=yes
+
+
+# The cast to long int works around a bug in the HP C Compiler
@@ -49586,7 +49569,7 @@
+ 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
+-samba_cv_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
@@ -49606,7 +49589,10 @@
+$as_echo "$ac_cv_sizeof_long" >&6; }
-- if test x"$linux_getgrouplist_ok" = x"yes"; then
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_linux_getgrouplist_ok" >&5
+-$as_echo "$samba_cv_linux_getgrouplist_ok" >&6; }
+- if test x"$samba_cv_linux_getgrouplist_ok" = x"yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETGROUPLIST 1
@@ -50573,8 +50559,9 @@
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+- ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
+
-+
+{ $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 :
@@ -50583,8 +50570,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
-
-- 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 :
@@ -50897,11 +50883,11 @@
+fi
+
+
++
++ if test "x$CUPS_CONFIG" != x; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ if test "x$CUPS_CONFIG" != x; then
-+
+ ac_save_CFLAGS=$CFLAGS
+ ac_save_LDFLAGS=$LDFLAGS
+ ac_save_PRINT_LIBS=$PRINT_LIBS
@@ -51504,20 +51490,20 @@
+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 :
-
--fi
++
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
+_ACEOF
+-fi
+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
-+fi
-+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec type" >&5
+$as_echo_n "checking for struct timespec type... " >&6; }
+if test "${samba_cv_struct_timespec+set}" = set; then :
@@ -51933,23 +51919,23 @@
+###############################################
+# Readline included by default unless explicitly asked not to
+test "${with_readline+set}" != "set" && with_readline=yes
-+
-+# test for where we get readline() from
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
-+$as_echo_n "checking whether to use readline... " >&6; }
-#
-# Check for the functions putprpwnam, set_auth_parameters,
-# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
-# Needed for OSF1 and HPUX.
-#
++# 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`
@@ -51962,8 +51948,6 @@
+fi
-+done
-
-for ac_func in putprpwnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -51974,6 +51958,8 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
++done
++
+ for ac_header in readline/history.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
@@ -52027,7 +52013,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47059,100 +14377,41 @@
+@@ -47067,100 +14377,41 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52148,7 +52134,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47161,111 +14420,106 @@
+@@ -47169,111 +14420,106 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52329,7 +52315,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47273,100 +14527,41 @@
+@@ -47281,100 +14527,41 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52450,7 +52436,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47375,112 +14570,68 @@
+@@ -47383,112 +14570,68 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52551,11 +52537,11 @@
fi
-done
--
+-
-for ac_func in set_auth_parameters
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -52598,7 +52584,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47488,100 +14639,54 @@
+@@ -47496,100 +14639,54 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52727,7 +52713,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47590,111 +14695,43 @@
+@@ -47598,111 +14695,43 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -52813,10 +52799,10 @@
fi
-done
+-
-
--
-for ac_func in set_auth_parameters
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -52857,7 +52843,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47702,316 +14739,299 @@
+@@ -47710,316 +14739,299 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53234,12 +53220,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
@@ -53394,7 +53380,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48020,112 +15040,179 @@
+@@ -48028,112 +15040,179 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53467,7 +53453,7 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRT 1
+_ACEOF
-
++
+ case "$LIBS" in
+ *-lrt*)
+ ;;
@@ -53476,9 +53462,9 @@
+ ;;
+ esac
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
-+
+fi
+fi
+done
@@ -53643,7 +53629,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48133,100 +15220,66 @@
+@@ -48141,100 +15220,66 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53786,7 +53772,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48235,326 +15288,192 @@
+@@ -48243,212 +15288,191 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53843,34 +53829,20 @@
-{ $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="-lsecurity $LIBS"
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exc_trace_back_stack" >&5
+$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
+if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBEXC 1
- _ACEOF
++_ACEOF
--
--
--else
--
--
-- # getspnam was not found in libsecurity
-- # nothing to do here by default
-- true
--
+- LIBS="-lsecurity $LIBS"
+ LIBS="-lexc $LIBS"
- fi
++fi
-- ;;
-- esac
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
+
+# check for sysctlbyname for BSD systems
+for ac_func in sysctlbyname
@@ -53879,14 +53851,78 @@
+if test "x$ac_cv_func_sysctlbyname" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSCTLBYNAME 1
+ _ACEOF
+
++fi
++done
+
+
+-else
++#############################
++# 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
- fi
- done
++fi
+- # getspnam was not found in libsecurity
+- # nothing to do here by default
+- true
++done
++
++if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
++$as_echo "#define HAVE_GPFS 1" >>confdefs.h
+
++ default_shared_modules="$default_shared_modules vfs_gpfs"
+ fi
+
+- ;;
+- esac
-
--
++#############################################
++# 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 ()
++{
++get_isilon_copyright()
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ samba_cv_HAVE_ONEFS=yes
++else
++ samba_cv_HAVE_ONEFS=no
+ fi
+-done
++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"
+
-for ac_func in getspnam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53897,26 +53933,31 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+#############################
-+# 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
+-_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
++# 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
-/* 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. */
++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
-#ifdef __STDC__
@@ -53924,10 +53965,26 @@
-#else
-# include <assert.h>
-#endif
-+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
-#undef $ac_func
-+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
++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
@@ -53941,25 +53998,20 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
-+$as_echo "#define HAVE_GPFS 1" >>confdefs.h
-+
-+ default_shared_modules="$default_shared_modules vfs_gpfs"
-+fi
++#ifdef HAVE_LIBUNWIND_H
++#include <libunwind.h>
+ #endif
-+#############################################
-+# 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 ();
-+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;
}
@@ -53986,20 +54038,18 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ samba_cv_HAVE_ONEFS=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
--
++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
-+ samba_cv_HAVE_ONEFS=no
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -54010,106 +54060,74 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+
- # 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_ONEFS
-+if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
++$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
--_ACEOF
-+$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
++ # If we have libunwind, test whether we also have libunwind-ptrace
++ # which would let us unwind arbitrary processes.
++ save_LIBS=$LIBS
++ for ac_header in libunwind-ptrace.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "libunwind-ptrace.h" "ac_cv_header_libunwind_ptrace_h" "$ac_includes_default"
++if test "x$ac_cv_header_libunwind_ptrace_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBUNWIND_PTRACE_H 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"
+fi
-+LIBS="$save_LIBS"
++done
-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 libsec
- case " $LIBS " in
- *\ -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 libsec
- # nothing to do here by default
- true
-+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 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
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _UPT_create in -lunwind-ptrace" >&5
++$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
++if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lunwind-ptrace $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
-+#ifdef HAVE_LIBUNWIND_H
-+#include <libunwind.h>
+ /* Override any GCC internal prototype to avoid an error.
+@@ -48457,969 +15481,649 @@
+ #ifdef __cplusplus
+ extern "C"
#endif
-char getspnam ();
-+
++char _UPT_create ();
int
main ()
{
-return getspnam ();
-+
-+ 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 _UPT_create ();
;
return 0;
}
@@ -54136,106 +54154,122 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_sec_getspnam=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_unwind_ptrace__UPT_create=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_sec_getspnam=no
--fi
-+if ac_fn_c_try_link "$LINENO"; then :
-
++ ac_cv_lib_unwind_ptrace__UPT_create=no
+ fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_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
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
++$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
++if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then :
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
-+ # If we have libunwind, test whether we also have libunwind-ptrace
-+ # which would let us unwind arbitrary processes.
-+ save_LIBS=$LIBS
-+ for ac_header in libunwind-ptrace.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "libunwind-ptrace.h" "ac_cv_header_libunwind_ptrace_h" "$ac_includes_default"
-+if test "x$ac_cv_header_libunwind_ptrace_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBUNWIND_PTRACE_H 1
- _ACEOF
+-_ACEOF
++ LIBUNWIND_PTRACE="-lunwind-ptrace";
++$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
+
+
+ else
-
-
--else
--
--
- # getspnam was not found in libsec
- # nothing to do here by default
- true
-
-
++ LIBUNWIND_PTRACE=""
fi
- ;;
- esac
-
-fi
- done
+-done
--
--
--
--
++ LIBS=$save_LIBS
+
++else
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ LIBS=$save_LIBS
+
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
-for ac_func in bigcrypt
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _UPT_create in -lunwind-ptrace" >&5
-+$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
-+if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++# To use libunwind-ptrace, we also need to make some ptrace system calls.
++if test x"$LIBUNWIND_PTRACE" != x"" ; then
++ for ac_header in sys/ptrace.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/ptrace.h" "ac_cv_header_sys_ptrace_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_ptrace_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_PTRACE_H 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lunwind-ptrace $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
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++done
+
-#undef $ac_func
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux ptrace(2) interface" >&5
++$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -48562,856 +15481,641 @@
- #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
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
++#if HAVE_SYS_TYPES_H
++#include <sys/types.h>
#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
@@ -54243,14 +54277,20 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
--
-+char _UPT_create ();
++#if HAVE_SYS_PTRACE_H
++#include <sys/ptrace.h>
+ #endif
+
int
main ()
{
-return $ac_func ();
-+return _UPT_create ();
++
++ pid_t me = (pid_t)-1;
++ ptrace(PTRACE_ATTACH, me, 0, 0);
++ ptrace(PTRACE_DETACH, me, 0, 0);
++ return 0;
++
;
return 0;
}
@@ -54277,23 +54317,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_unwind_ptrace__UPT_create=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ ac_cv_lib_unwind_ptrace__UPT_create=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -54304,34 +54338,28 @@
- 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_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 :
-
+-
- # bigcrypt was found in libc or existing $LIBS
-+ LIBUNWIND_PTRACE="-lunwind-ptrace";
+-
++if ac_fn_c_try_link "$LINENO"; then :
-+$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIGCRYPT 1
-_ACEOF
-+
-+else
-+ LIBUNWIND_PTRACE=""
-+fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++$as_echo "#define HAVE_LINUX_PTRACE 1" >>confdefs.h
-+ LIBS=$save_LIBS
else
- # bigcrypt was not found, try adding libsecurity
- case " $LIBS " in
- *\ -lsecurity\ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
-+ LIBS=$save_LIBS
++ LIBUNWIND_PTRACE=""
- # bigcrypt was not found and we already had libsecurity
- # nothing to do here by default
@@ -54339,6 +54367,7 @@
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
++fi
- ;;
- *)
@@ -54352,53 +54381,34 @@
-LIBS="-lsecurity $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# To use libunwind-ptrace, we also need to make some ptrace system calls.
-+if test x"$LIBUNWIND_PTRACE" != x"" ; then
-+ for ac_header in sys/ptrace.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/ptrace.h" "ac_cv_header_sys_ptrace_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_ptrace_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_PTRACE_H 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+
-+done
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux ptrace(2) interface" >&5
-+$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
- #endif
+-#endif
-char bigcrypt ();
-+#if HAVE_SYS_PTRACE_H
-+#include <sys/ptrace.h>
-+#endif
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-return bigcrypt ();
+- ;
+- return 0;
+-}
+
-+ pid_t me = (pid_t)-1;
-+ ptrace(PTRACE_ATTACH, me, 0, 0);
-+ ptrace(PTRACE_DETACH, me, 0, 0);
-+ return 0;
-+
- ;
- return 0;
- }
++for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -54422,23 +54432,23 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_security_bigcrypt=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_LINUX_PTRACE 1" >>confdefs.h
-+
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_security_bigcrypt=no
--fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ LIBUNWIND_PTRACE=""
+ fi
++done
++
++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`
++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 \
@@ -54448,16 +54458,25 @@
-{ $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
++done
- LIBS="-lsecurity $LIBS"
++for ac_func in __getcwd _getcwd
++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 _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
++for ac_func in __xstat __fxstat __lxstat
+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"
@@ -54470,7 +54489,7 @@
+fi
+done
-+for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
++for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54484,7 +54503,7 @@
+fi
+done
-+for ac_func in __getcwd _getcwd
++for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54500,7 +54519,7 @@
+fi
+done
-+for ac_func in __xstat __fxstat __lxstat
++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"
@@ -54515,7 +54534,7 @@
- ;;
- esac
-+for ac_func in _stat _lstat _fstat __stat __lstat __fstat
++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"
@@ -54528,7 +54547,7 @@
fi
done
-+for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++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"
@@ -54552,7 +54571,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
++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"
@@ -54582,7 +54601,7 @@
+done
-#undef $ac_func
-+for ac_func in getdents __getdents _lseek __lseek _read __read
++for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54615,7 +54634,7 @@
- ;
- return 0;
-}
-+for ac_func in getdirentries _write __write _fork __fork
++for ac_func in pread _pread __pread pread64 _pread64 __pread64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54665,7 +54684,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 _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54676,25 +54695,13 @@
_ACEOF
- # bigcrypt was found in libc or existing $LIBS
+-
+fi
+done
-+
-+for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+fi
-+done
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIGCRYPT 1
-+for ac_func in pread _pread __pread pread64 _pread64 __pread64
++for ac_func in open64 _open64 __open64 creat64
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54707,38 +54714,25 @@
+fi
+done
-+for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
++for ac_func in prctl
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
++if test "x$ac_cv_func_prctl" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_PRCTL 1
+_ACEOF
-else
-+fi
-+done
-
+-
- # bigcrypt was not found, try adding libsec
- case " $LIBS " in
- *\ -lsec\ *)
-+for ac_func in open64 _open64 __open64 creat64
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
++fi
++done
- # bigcrypt was not found and we already had libsec
- # nothing to do here by default
- true
-+fi
-+done
- ;;
- *)
@@ -54752,20 +54746,9 @@
-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in prctl
-+do :
-+ ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
-+if test "x$ac_cv_func_prctl" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_PRCTL 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+done
-+
-+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -54830,23 +54813,31 @@
-
- LIBS="-lsec $LIBS"
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIGCRYPT 1
-_ACEOF
+-
+-
++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:${as_lineno-$LINENO}: checking for good getgrouplist" >&5
++$as_echo_n "checking for good getgrouplist... " >&6; }
++if test "${samba_cv_linux_getgrouplist_ok+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
-+else
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -54858,6 +54849,9 @@
+ int libc_major = __GLIBC__;
+ int libc_minor = __GLIBC_MINOR__;
+- # bigcrypt was not found in libsec
+- # nothing to do here by default
+- true
+ if (libc_major < 2)
+ exit(1);
+ if ((libc_major == 2) && (libc_minor <= 3))
@@ -54868,26 +54862,23 @@
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
-+ linux_getgrouplist_ok=yes
- else
-+ linux_getgrouplist_ok=no
++ samba_cv_linux_getgrouplist_ok=yes
++else
++ samba_cv_linux_getgrouplist_ok=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
-+ if test x"$linux_getgrouplist_ok" = x"yes"; then
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_linux_getgrouplist_ok" >&5
++$as_echo "$samba_cv_linux_getgrouplist_ok" >&6; }
++ if test x"$samba_cv_linux_getgrouplist_ok" = x"yes"; then
-- # bigcrypt was not found in libsec
-- # nothing to do here by default
-- true
--
--
--fi
-+$as_echo "#define HAVE_GETGROUPLIST 1" >>confdefs.h
-
- ;;
- esac
++$as_echo "#define HAVE_GETGROUPLIST 1" >>confdefs.h
++
+ fi
+ ;;
+ *)
@@ -55530,7 +55521,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49419,85 +16123,43 @@
+@@ -49427,85 +16131,43 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -55636,7 +55627,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -49506,108 +16168,44 @@
+@@ -49514,108 +16176,44 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -55767,7 +55758,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49615,103 +16213,80 @@
+@@ -49623,103 +16221,80 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -55922,7 +55913,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49719,183 +16294,89 @@
+@@ -49727,183 +16302,89 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56161,7 +56152,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -49904,109 +16385,91 @@
+@@ -49912,109 +16393,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56331,7 +56322,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50014,105 +16477,90 @@
+@@ -50022,105 +16485,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56496,7 +56487,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50120,105 +16568,92 @@
+@@ -50128,105 +16576,92 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56663,7 +56654,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50226,103 +16661,91 @@
+@@ -50234,103 +16669,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56828,7 +56819,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50330,102 +16753,90 @@
+@@ -50338,102 +16761,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56992,7 +56983,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50433,103 +16844,91 @@
+@@ -50441,103 +16852,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57158,7 +57149,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50537,103 +16936,90 @@
+@@ -50545,103 +16944,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57322,7 +57313,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50641,107 +17027,91 @@
+@@ -50649,107 +17035,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57493,7 +57484,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50749,190 +17119,90 @@
+@@ -50757,190 +17127,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57733,7 +57724,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50940,102 +17210,77 @@
+@@ -50948,102 +17218,77 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57885,7 +57876,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51043,62 +17288,53 @@
+@@ -51051,62 +17296,53 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57984,7 +57975,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51106,39 +17342,40 @@
+@@ -51114,39 +17350,40 @@
fi
done
@@ -58052,7 +58043,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51146,62 +17383,118 @@
+@@ -51154,62 +17391,118 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58215,7 +58206,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51209,102 +17502,141 @@
+@@ -51217,102 +17510,141 @@
fi
done
@@ -58432,7 +58423,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51316,7 +17648,7 @@
+@@ -51324,7 +17656,7 @@
esac
# Check whether --enable-static was given.
@@ -58441,7 +58432,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -51338,7 +17670,7 @@
+@@ -51346,7 +17678,7 @@
fi
# Check whether --enable-shared was given.
@@ -58450,7 +58441,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -51365,16 +17697,16 @@
+@@ -51373,16 +17705,16 @@
PIE_CFLAGS=""
PIE_LDFLAGS=""
# Check whether --enable-pie was given.
@@ -58470,7 +58461,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51383,11 +17715,11 @@
+@@ -51391,11 +17723,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5'
@@ -58485,7 +58476,7 @@
then
samba_cv_fpie=yes
else
-@@ -51396,7 +17728,7 @@
+@@ -51404,7 +17736,7 @@
rm -f conftest*
fi
@@ -58494,7 +58485,7 @@
$as_echo "$samba_cv_fpie" >&6; }
if test x"${samba_cv_fpie}" = x"yes"
then
-@@ -51408,16 +17740,16 @@
+@@ -51416,16 +17748,16 @@
# Set defaults
RELRO_LDFLAGS=""
# Check whether --enable-relro was given.
@@ -58514,7 +58505,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51426,11 +17758,11 @@
+@@ -51434,11 +17766,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -58529,7 +58520,7 @@
then
samba_cv_relro=yes
else
-@@ -51439,7 +17771,7 @@
+@@ -51447,7 +17779,7 @@
rm -f conftest*
fi
@@ -58538,7 +58529,7 @@
$as_echo "$samba_cv_relro" >&6; }
if test x"${samba_cv_relro}" = x"yes"
then
-@@ -51468,7 +17800,7 @@
+@@ -51476,7 +17808,7 @@
# You need to specify how to create a shared library and
# how to compile C code to produce PIC object files
@@ -58547,7 +58538,7 @@
$as_echo_n "checking ability to build shared libraries... " >&6; }
# and these are for particular systems
-@@ -51476,14 +17808,10 @@
+@@ -51484,14 +17816,10 @@
*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
case "$host_os" in
*linux*)
@@ -58564,7 +58555,7 @@
;;
esac
BLDSHARED="true"
-@@ -51494,15 +17822,11 @@
+@@ -51502,15 +17830,11 @@
DYNEXP="-Wl,--export-dynamic"
PICFLAG="-fPIC"
SONAMEFLAG="-Wl,-soname="
@@ -58582,7 +58573,7 @@
BLDSHARED="true"
LDSHFLAGS="-G"
-@@ -51520,33 +17844,23 @@
+@@ -51528,33 +17852,23 @@
LDSHFLAGS="-G \${CFLAGS}"
fi
@@ -58621,7 +58612,7 @@
;;
*netbsd* | *freebsd* | *dragonfly* )
-@@ -51556,14 +17870,10 @@
+@@ -51564,14 +17878,10 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC -DPIC"
@@ -58638,7 +58629,7 @@
;;
*openbsd*) BLDSHARED="true"
-@@ -51572,26 +17882,18 @@
+@@ -51580,26 +17890,18 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC"
@@ -58669,7 +58660,7 @@
;;
esac
-@@ -51605,15 +17907,11 @@
+@@ -51613,15 +17915,11 @@
PICFLAG="-KPIC"
fi
@@ -58687,7 +58678,7 @@
BLDSHARED="true"
# use expfull to export underscored symbols
-@@ -51629,25 +17927,17 @@
+@@ -51637,25 +17935,17 @@
fi
@@ -58717,7 +58708,7 @@
# Use special PIC flags for the native HP-UX compiler.
BLDSHARED="true"
-@@ -51669,74 +17959,52 @@
+@@ -51677,74 +17967,52 @@
DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
fi
@@ -58805,7 +58796,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ROFF"; then
-@@ -51747,91 +18015,71 @@
+@@ -51755,91 +18023,71 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -58912,7 +58903,7 @@
BLDSHARED="true"
LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -51845,16 +18093,12 @@
+@@ -51853,16 +18101,12 @@
# actually support the PIE stuff.
PIE_LDFLAGS=
PIE_CFLAGS=
@@ -58931,7 +58922,7 @@
;;
esac
-@@ -51871,19 +18115,15 @@
+@@ -51879,19 +18123,15 @@
LDFLAGS="$LDFLAGS -L./bin"
fi
@@ -58954,7 +58945,7 @@
/* end confdefs.h. */
int
-@@ -51894,42 +18134,17 @@
+@@ -51902,42 +18142,17 @@
return 0;
}
_ACEOF
@@ -59002,7 +58993,7 @@
LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
test x"$ld_as_needed_flag_found" = xyes && break
done
-@@ -51942,14 +18157,10 @@
+@@ -51950,14 +18165,10 @@
for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
saved_ldflags="$LDFLAGS"
@@ -59019,7 +59010,7 @@
/* end confdefs.h. */
int
-@@ -51960,94 +18171,69 @@
+@@ -51968,94 +18179,69 @@
return 0;
}
_ACEOF
@@ -59139,7 +59130,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -52063,7 +18249,7 @@
+@@ -52071,7 +18257,7 @@
fi
@@ -59148,7 +59139,7 @@
$as_echo "$ac_cv_shlib_works" >&6; }
if test $ac_cv_shlib_works = no; then
BLDSHARED=false
-@@ -52080,9 +18266,9 @@
+@@ -52088,9 +18274,9 @@
merged_build_possible=no
fi
@@ -59160,7 +59151,7 @@
$as_echo "$PICFLAG" >&6; }
-@@ -52154,10 +18340,10 @@
+@@ -52162,10 +18348,10 @@
USESHARED=false
@@ -59173,7 +59164,7 @@
enableval=$enable_shared_libs; enable_shared_libs=$enableval
else
enable_shared_libs=yes
-@@ -52168,11 +18354,11 @@
+@@ -52176,11 +18362,11 @@
USESHARED=$BLDSHARED
fi
@@ -59187,7 +59178,7 @@
$as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
fi
-@@ -52200,14 +18386,13 @@
+@@ -52208,14 +18394,13 @@
# Check whether --with-static-libs was given.
@@ -59204,7 +59195,7 @@
fi
-@@ -52229,7 +18414,7 @@
+@@ -52237,7 +18422,7 @@
# be extracted from their respective source directories
#
# Check whether --enable-external_libtalloc was given.
@@ -59213,7 +59204,7 @@
enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval
else
enable_external_libtalloc=auto
-@@ -52244,9 +18429,9 @@
+@@ -52252,9 +18437,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
@@ -59225,7 +59216,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -52259,14 +18444,14 @@
+@@ -52267,14 +18452,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -59243,7 +59234,7 @@
IFS=$as_save_IFS
;;
-@@ -52274,10 +18459,10 @@
+@@ -52282,10 +18467,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -59256,7 +59247,7 @@
$as_echo "no" >&6; }
fi
-@@ -52287,9 +18472,9 @@
+@@ -52295,9 +18480,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
@@ -59268,7 +59259,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -52302,14 +18487,14 @@
+@@ -52310,14 +18495,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -59286,7 +59277,7 @@
IFS=$as_save_IFS
;;
-@@ -52317,10 +18502,10 @@
+@@ -52325,10 +18510,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -59299,7 +59290,7 @@
$as_echo "no" >&6; }
fi
-@@ -52329,7 +18514,7 @@
+@@ -52337,7 +18522,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -59308,7 +59299,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -52342,13 +18527,13 @@
+@@ -52350,13 +18535,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -59325,7 +59316,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -52356,7 +18541,7 @@
+@@ -52364,7 +18549,7 @@
fi
pkg_failed=no
@@ -59334,7 +59325,7 @@
$as_echo_n "checking for LIBTALLOC... " >&6; }
if test -n "$PKG_CONFIG"; then
-@@ -52364,11 +18549,11 @@
+@@ -52372,11 +18557,11 @@
pkg_cv_LIBTALLOC_CFLAGS="$LIBTALLOC_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
@@ -59349,7 +59340,7 @@
pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
else
pkg_failed=yes
-@@ -52382,11 +18567,11 @@
+@@ -52390,11 +18575,11 @@
pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -59364,7 +59355,7 @@
pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
else
pkg_failed=yes
-@@ -52413,768 +18598,112 @@
+@@ -52421,768 +18606,112 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBTALLOC_PKG_ERRORS" >&5
@@ -60205,7 +60196,7 @@
$as_echo "$ac_cv_sizeof_void_p" >&6; }
-@@ -53186,17 +18715,15 @@
+@@ -53194,17 +18723,15 @@
if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
@@ -60228,7 +60219,7 @@
fi
if test x"$VERSIONSCRIPT" != "x"; then
-@@ -53231,16 +18758,16 @@
+@@ -53239,16 +18766,16 @@
@@ -60248,7 +60239,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -53266,7 +18793,7 @@
+@@ -53274,7 +18801,7 @@
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
@@ -60257,7 +60248,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
enable_static=yes
-@@ -53279,12 +18806,12 @@
+@@ -53287,12 +18814,12 @@
enable_static=yes
LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
@@ -60272,7 +60263,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -53310,7 +18837,7 @@
+@@ -53318,7 +18845,7 @@
# Check whether --enable-external_libtdb was given.
@@ -60281,7 +60272,7 @@
enableval=$enable_external_libtdb; enable_external_libtalloc=$enableval
else
enable_external_libtalloc=auto
-@@ -53321,7 +18848,7 @@
+@@ -53329,7 +18856,7 @@
then
pkg_failed=no
@@ -60290,7 +60281,7 @@
$as_echo_n "checking for LIBTDB... " >&6; }
if test -n "$PKG_CONFIG"; then
-@@ -53329,11 +18856,11 @@
+@@ -53337,11 +18864,11 @@
pkg_cv_LIBTDB_CFLAGS="$LIBTDB_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
@@ -60305,7 +60296,7 @@
pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.1.7" 2>/dev/null`
else
pkg_failed=yes
-@@ -53347,11 +18874,11 @@
+@@ -53355,11 +18882,11 @@
pkg_cv_LIBTDB_LIBS="$LIBTDB_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -60320,7 +60311,7 @@
pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.1.7" 2>/dev/null`
else
pkg_failed=yes
-@@ -53378,13 +18905,11 @@
+@@ -53386,13 +18913,11 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBTDB_PKG_ERRORS" >&5
@@ -60336,7 +60327,7 @@
else
enable_external_libtdb=no
fi
-@@ -53392,9 +18917,7 @@
+@@ -53400,9 +18925,7 @@
elif test $pkg_failed = untried; then
if test x$enable_external_libtdb = xyes; then
@@ -60347,7 +60338,7 @@
else
enable_external_libtdb=no
fi
-@@ -53402,7 +18925,7 @@
+@@ -53410,7 +18933,7 @@
else
LIBTDB_CFLAGS=$pkg_cv_LIBTDB_CFLAGS
LIBTDB_LIBS=$pkg_cv_LIBTDB_LIBS
@@ -60356,7 +60347,7 @@
$as_echo "yes" >&6; }
enable_external_libtdb=yes
fi
-@@ -53421,9 +18944,7 @@
+@@ -53429,9 +18952,7 @@
fi
done
if test x"$tdbdir" = "x"; then
@@ -60367,7 +60358,7 @@
fi
TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
-@@ -53436,104 +18957,12 @@
+@@ -53444,104 +18965,12 @@
TDB_CFLAGS="-I$tdbdir/include"
@@ -60477,7 +60468,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -53541,151 +18970,12 @@
+@@ -53549,151 +18978,12 @@
fi
done
@@ -60634,7 +60625,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -53696,17 +18986,13 @@
+@@ -53704,17 +18994,13 @@
@@ -60655,7 +60646,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -53717,56 +19003,29 @@
+@@ -53725,56 +19011,29 @@
return 0;
}
_ACEOF
@@ -60719,7 +60710,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -53777,41 +19036,18 @@
+@@ -53785,41 +19044,18 @@
return 0;
}
_ACEOF
@@ -60765,7 +60756,7 @@
fi
-@@ -53848,16 +19084,16 @@
+@@ -53856,16 +19092,16 @@
@@ -60785,7 +60776,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -53883,7 +19119,7 @@
+@@ -53891,7 +19127,7 @@
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
@@ -60794,7 +60785,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
enable_static=yes
-@@ -53896,12 +19132,12 @@
+@@ -53904,12 +19140,12 @@
enable_static=yes
LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
@@ -60809,7 +60800,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -53957,16 +19193,16 @@
+@@ -53965,16 +19201,16 @@
@@ -60829,7 +60820,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -53992,7 +19228,7 @@
+@@ -54000,7 +19236,7 @@
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
@@ -60838,7 +60829,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
enable_static=yes
-@@ -54005,12 +19241,12 @@
+@@ -54013,12 +19249,12 @@
enable_static=yes
LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
@@ -60853,7 +60844,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -54048,16 +19284,16 @@
+@@ -54056,16 +19292,16 @@
@@ -60873,7 +60864,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -54083,7 +19319,7 @@
+@@ -54091,7 +19327,7 @@
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
@@ -60882,7 +60873,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
enable_static=yes
-@@ -54096,12 +19332,12 @@
+@@ -54104,12 +19340,12 @@
enable_static=yes
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
@@ -60897,7 +60888,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -54139,16 +19375,16 @@
+@@ -54147,16 +19383,16 @@
@@ -60917,7 +60908,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -54174,7 +19410,7 @@
+@@ -54182,7 +19418,7 @@
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -60926,7 +60917,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
enable_static=yes
-@@ -54187,12 +19423,12 @@
+@@ -54195,12 +19431,12 @@
enable_static=yes
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
@@ -60941,7 +60932,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -54230,19 +19466,19 @@
+@@ -54238,19 +19474,19 @@
@@ -60964,7 +60955,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -54251,7 +19487,7 @@
+@@ -54259,7 +19495,7 @@
else
# if unspecified, default is not to build
@@ -60973,7 +60964,7 @@
$as_echo "no" >&6; }
build_lib=no
-@@ -54267,7 +19503,7 @@
+@@ -54275,7 +19511,7 @@
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
@@ -60982,7 +60973,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
enable_static=yes
-@@ -54280,12 +19516,12 @@
+@@ -54288,12 +19524,12 @@
enable_static=yes
LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
@@ -60997,7 +60988,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -54302,165 +19538,39 @@
+@@ -54310,165 +19546,39 @@
################
@@ -61175,7 +61166,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -54470,102 +19580,9 @@
+@@ -54478,102 +19588,9 @@
fi
else
@@ -61280,7 +61271,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -54580,17 +19597,13 @@
+@@ -54588,17 +19605,13 @@
# Check if the compiler supports the LL prefix on long long integers.
# AIX needs this.
@@ -61301,7 +61292,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -54601,190 +19614,97 @@
+@@ -54609,190 +19622,97 @@
return 0;
}
_ACEOF
@@ -61520,7 +61511,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -54794,67 +19714,34 @@
+@@ -54802,67 +19722,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
@@ -61598,7 +61589,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -54864,67 +19751,34 @@
+@@ -54872,67 +19759,34 @@
#include <sys/stat.h>
main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
_ACEOF
@@ -61676,7 +61667,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -54934,67 +19788,34 @@
+@@ -54942,67 +19796,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
@@ -61754,7 +61745,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -55004,67 +19825,34 @@
+@@ -55012,67 +19833,34 @@
#include <sys/stat.h>
main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
_ACEOF
@@ -61832,7 +61823,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -55074,64 +19862,31 @@
+@@ -55082,64 +19870,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
@@ -61906,7 +61897,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -55147,55 +19902,28 @@
+@@ -55155,55 +19910,28 @@
return 0;
}
_ACEOF
@@ -61969,7 +61960,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -55211,58 +19939,31 @@
+@@ -55219,58 +19947,31 @@
return 0;
}
_ACEOF
@@ -62036,7 +62027,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -55271,67 +19972,34 @@
+@@ -55279,67 +19980,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = major(dev); return 0; }
_ACEOF
@@ -62114,7 +62105,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -55340,67 +20008,34 @@
+@@ -55348,67 +20016,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = minor(dev); return 0; }
_ACEOF
@@ -62192,7 +62183,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -55409,129 +20044,63 @@
+@@ -55417,129 +20052,63 @@
#include <sys/types.h>
main() { dev_t dev = makedev(1,2); return 0; }
_ACEOF
@@ -62341,7 +62332,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -55544,55 +20113,28 @@
+@@ -55552,55 +20121,28 @@
return 0;
}
_ACEOF
@@ -62404,7 +62395,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -55603,55 +20145,28 @@
+@@ -55611,55 +20153,28 @@
return 0;
}
_ACEOF
@@ -62467,7 +62458,7 @@
/* end confdefs.h. */
#include <sys/time.h>
-@@ -55664,46 +20179,19 @@
+@@ -55672,46 +20187,19 @@
return 0;
}
_ACEOF
@@ -62520,7 +62511,7 @@
fi
-@@ -55715,120 +20203,24 @@
+@@ -55723,120 +20211,24 @@
# which rely on signals.
@@ -62649,7 +62640,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -55852,58 +20244,27 @@
+@@ -55860,58 +20252,27 @@
return 0;
}
_ACEOF
@@ -62716,7 +62707,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -55927,58 +20288,27 @@
+@@ -55935,58 +20296,27 @@
return 0;
}
_ACEOF
@@ -62783,7 +62774,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -56002,49 +20332,22 @@
+@@ -56010,49 +20340,22 @@
return 0;
}
_ACEOF
@@ -62839,7 +62830,7 @@
-@@ -56062,18 +20365,14 @@
+@@ -56070,18 +20373,14 @@
;;
*)
# clock_gettime was not found, try adding librt
@@ -62861,7 +62852,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56091,60 +20390,29 @@
+@@ -56099,60 +20398,29 @@
return 0;
}
_ACEOF
@@ -62931,7 +62922,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -56168,58 +20436,27 @@
+@@ -56176,58 +20444,27 @@
return 0;
}
_ACEOF
@@ -62998,7 +62989,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -56243,58 +20480,27 @@
+@@ -56251,58 +20488,27 @@
return 0;
}
_ACEOF
@@ -63065,7 +63056,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -56318,49 +20524,22 @@
+@@ -56326,49 +20532,22 @@
return 0;
}
_ACEOF
@@ -63121,7 +63112,7 @@
-@@ -56385,20 +20564,16 @@
+@@ -56393,20 +20572,16 @@
fi
@@ -63146,7 +63137,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -56406,216 +20581,67 @@
+@@ -56414,216 +20589,67 @@
if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
di->d_name[0] == 0) exit(0); exit(1);}
_ACEOF
@@ -63394,7 +63385,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -56624,17 +20650,13 @@
+@@ -56632,17 +20658,13 @@
done
@@ -63415,7 +63406,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -56646,55 +20668,28 @@
+@@ -56654,55 +20676,28 @@
return 0;
}
_ACEOF
@@ -63478,7 +63469,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -56706,55 +20701,28 @@
+@@ -56714,55 +20709,28 @@
return 0;
}
_ACEOF
@@ -63541,7 +63532,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -56766,55 +20734,28 @@
+@@ -56774,55 +20742,28 @@
return 0;
}
_ACEOF
@@ -63604,7 +63595,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -56826,55 +20767,28 @@
+@@ -56834,55 +20775,28 @@
return 0;
}
_ACEOF
@@ -63667,7 +63658,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -56886,55 +20800,28 @@
+@@ -56894,55 +20808,28 @@
return 0;
}
_ACEOF
@@ -63730,7 +63721,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -56946,55 +20833,28 @@
+@@ -56954,55 +20841,28 @@
return 0;
}
_ACEOF
@@ -63793,7 +63784,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -57006,55 +20866,28 @@
+@@ -57014,55 +20874,28 @@
return 0;
}
_ACEOF
@@ -63856,7 +63847,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -57066,55 +20899,28 @@
+@@ -57074,55 +20907,28 @@
return 0;
}
_ACEOF
@@ -63919,7 +63910,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -57126,55 +20932,28 @@
+@@ -57134,55 +20940,28 @@
return 0;
}
_ACEOF
@@ -63982,7 +63973,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -57186,55 +20965,28 @@
+@@ -57194,55 +20973,28 @@
return 0;
}
_ACEOF
@@ -64045,7 +64036,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -57246,56 +20998,29 @@
+@@ -57254,56 +21006,29 @@
return 0;
}
_ACEOF
@@ -64109,7 +64100,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -57307,56 +21032,29 @@
+@@ -57315,56 +21040,29 @@
return 0;
}
_ACEOF
@@ -64173,7 +64164,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmpx.h>
-@@ -57368,41 +21066,18 @@
+@@ -57376,41 +21074,18 @@
return 0;
}
_ACEOF
@@ -64219,7 +64210,7 @@
fi
-@@ -57413,12 +21088,10 @@
+@@ -57421,12 +21096,10 @@
ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
# Check whether --with-libiconv was given.
@@ -64234,7 +64225,7 @@
else
if test "$withval" != "yes" ; then
ICONV_PATH_SPEC=yes
-@@ -57464,7 +21137,7 @@
+@@ -57472,7 +21145,7 @@
export LDFLAGS LIBS CPPFLAGS
# Try to find iconv(3)
@@ -64243,7 +64234,7 @@
$as_echo_n "checking for iconv in $i/$l... " >&6; }
jm_cv_func_iconv="no"
jm_cv_lib_iconv=""
-@@ -57472,11 +21145,7 @@
+@@ -57480,11 +21153,7 @@
jm_save_LIBS="$LIBS"
if test "$jm_cv_func_iconv" != yes; then
@@ -64256,7 +64247,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -57490,48 +21159,17 @@
+@@ -57498,48 +21167,17 @@
return 0;
}
_ACEOF
@@ -64309,7 +64300,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -57545,49 +21183,18 @@
+@@ -57553,49 +21191,18 @@
return 0;
}
_ACEOF
@@ -64363,7 +64354,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -57601,53 +21208,22 @@
+@@ -57609,53 +21216,22 @@
return 0;
}
_ACEOF
@@ -64421,7 +64412,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -57661,50 +21237,19 @@
+@@ -57669,50 +21245,19 @@
return 0;
}
_ACEOF
@@ -64476,7 +64467,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <biconv.h>
-@@ -57718,42 +21263,15 @@
+@@ -57726,42 +21271,15 @@
return 0;
}
_ACEOF
@@ -64522,7 +64513,7 @@
LIBS="$jm_save_LIBS"
fi
-@@ -57764,36 +21282,30 @@
+@@ -57772,36 +21290,30 @@
if test "$jm_cv_func_iconv" = yes; then
if test "$jm_cv_giconv" = yes; then
@@ -64566,7 +64557,7 @@
$as_echo "no" >&6; }
fi
-@@ -57831,16 +21343,12 @@
+@@ -57839,16 +21351,12 @@
# check for default dos charset name
for j in CP850 IBM850 ; do
@@ -64586,7 +64577,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -57853,43 +21361,16 @@
+@@ -57861,43 +21369,16 @@
}
_ACEOF
@@ -64635,7 +64626,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_dos_charset="$ICONV_CHARSET"
-@@ -57901,16 +21382,12 @@
+@@ -57909,16 +21390,12 @@
# check for default display charset name
for j in ASCII 646 ; do
@@ -64655,7 +64646,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -57923,43 +21400,16 @@
+@@ -57931,43 +21408,16 @@
}
_ACEOF
@@ -64704,7 +64695,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_display_charset="$ICONV_CHARSET"
-@@ -57971,16 +21421,12 @@
+@@ -57979,16 +21429,12 @@
# check for default unix charset name
for j in UTF-8 UTF8 ; do
@@ -64724,7 +64715,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -57993,43 +21439,16 @@
+@@ -58001,43 +21447,16 @@
}
_ACEOF
@@ -64773,7 +64764,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_unix_charset="$ICONV_CHARSET"
-@@ -58068,9 +21487,9 @@
+@@ -58076,9 +21495,9 @@
default_display_charset="ASCII"
default_unix_charset="UTF-8"
samba_cv_HAVE_NATIVE_ICONV=yes
@@ -64785,7 +64776,7 @@
$as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
fi
-@@ -58094,9 +21513,7 @@
+@@ -58102,9 +21521,7 @@
default_unix_charset="\"$default_unix_charset\""
@@ -64796,7 +64787,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -58130,7 +21547,7 @@
+@@ -58138,7 +21555,7 @@
if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -64805,7 +64796,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;}
-@@ -58152,20 +21569,16 @@
+@@ -58160,20 +21577,16 @@
fi
@@ -64830,7 +64821,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -58179,67 +21592,34 @@
+@@ -58187,67 +21600,34 @@
}
_ACEOF
@@ -64908,7 +64899,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -58247,331 +21627,69 @@
+@@ -58255,331 +21635,69 @@
#include <signal.h>
#ifndef F_NOTIFY
#define F_NOTIFY 1026
@@ -65285,7 +65276,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -58582,54 +21700,29 @@
+@@ -58590,54 +21708,29 @@
return 0;
}
_ACEOF
@@ -65346,7 +65337,7 @@
fi
-@@ -58638,157 +21731,18 @@
+@@ -58646,157 +21739,18 @@
# http://oss.sgi.com/projects/fam/
# http://savannah.nongnu.org/projects/fam/
# Check whether --enable-fam was given.
@@ -65510,7 +65501,7 @@
_ACEOF
samba_cv_HAVE_FAM_H=yes
else
-@@ -58800,18 +21754,14 @@
+@@ -58808,18 +21762,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.
@@ -65532,7 +65523,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -58829,43 +21779,18 @@
+@@ -58837,43 +21787,18 @@
return 0;
}
_ACEOF
@@ -65582,7 +65573,7 @@
samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
else
samba_cv_HAVE_LIBFAM=no
-@@ -58876,23 +21801,17 @@
+@@ -58884,23 +21809,17 @@
samba_fam_xtra=-lC
@@ -65609,7 +65600,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -58910,72 +21829,41 @@
+@@ -58918,72 +21837,41 @@
return 0;
}
_ACEOF
@@ -65690,7 +65681,7 @@
/* end confdefs.h. */
#include <fam.h>
int
-@@ -58986,43 +21874,16 @@
+@@ -58994,43 +21882,16 @@
return 0;
}
_ACEOF
@@ -65737,7 +65728,7 @@
fi
fi
-@@ -59035,18 +21896,14 @@
+@@ -59043,18 +21904,14 @@
samba_dmapi_libs=""
if test x"$samba_dmapi_libs" = x"" ; then
@@ -65759,7 +65750,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -59064,61 +21921,32 @@
+@@ -59072,61 +21929,32 @@
return 0;
}
_ACEOF
@@ -65830,7 +65821,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -59136,61 +21964,32 @@
+@@ -59144,61 +21972,32 @@
return 0;
}
_ACEOF
@@ -65901,7 +65892,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -59208,61 +22007,32 @@
+@@ -59216,61 +22015,32 @@
return 0;
}
_ACEOF
@@ -65972,7 +65963,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -59280,43 +22050,18 @@
+@@ -59288,43 +22058,18 @@
return 0;
}
_ACEOF
@@ -66022,7 +66013,7 @@
samba_dmapi_libs="-lxdsm"
fi
-@@ -59325,153 +22070,12 @@
+@@ -59333,153 +22078,12 @@
# Only bother to test ehaders if we have a candidate DMAPI library
if test x"$samba_dmapi_libs" != x"" ; then
@@ -66182,7 +66173,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -59485,11 +22089,7 @@
+@@ -59493,11 +22097,7 @@
if test x"$samba_dmapi_libs" != x"" ; then
samba_dmapi_save_LIBS="$LIBS"
LIBS="$LIBS $samba_dmapi_libs"
@@ -66195,7 +66186,7 @@
/* end confdefs.h. */
#include <time.h> /* needed by Tru64 */
-@@ -59520,470 +22120,158 @@
+@@ -59528,470 +22128,158 @@
/* IRIX 6.4 expects events to be a pointer. */
DMEV_ISSET(DM_EVENT_READ, events);
@@ -66781,7 +66772,7 @@
-@@ -60000,18 +22288,14 @@
+@@ -60008,18 +22296,14 @@
;;
*)
# cap_get_proc was not found, try adding libcap
@@ -66803,7 +66794,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -60029,50 +22313,23 @@
+@@ -60037,50 +22321,23 @@
return 0;
}
_ACEOF
@@ -66861,7 +66852,7 @@
-@@ -60094,20 +22351,16 @@
+@@ -60102,20 +22359,16 @@
@@ -66886,7 +66877,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -60123,52 +22376,23 @@
+@@ -60131,52 +22384,23 @@
exit(0);
}
_ACEOF
@@ -66945,7 +66936,7 @@
else
LIBS=$ac_save_LIBS
-@@ -60181,17 +22405,13 @@
+@@ -60189,17 +22413,13 @@
# This is *really* broken but some systems (DEC OSF1) do this.... JRA.
#
@@ -66966,7 +66957,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -60205,55 +22425,28 @@
+@@ -60213,55 +22433,28 @@
return 0;
}
_ACEOF
@@ -67029,7 +67020,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -60267,55 +22460,28 @@
+@@ -60275,55 +22468,28 @@
return 0;
}
_ACEOF
@@ -67092,7 +67083,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -60329,55 +22495,28 @@
+@@ -60337,55 +22503,28 @@
return 0;
}
_ACEOF
@@ -67155,7 +67146,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -60391,56 +22530,29 @@
+@@ -60399,56 +22538,29 @@
return 0;
}
_ACEOF
@@ -67219,7 +67210,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_SECURITY_H
-@@ -60458,238 +22570,112 @@
+@@ -60466,238 +22578,112 @@
return 0;
}
_ACEOF
@@ -67494,7 +67485,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -60700,63 +22686,32 @@
+@@ -60708,63 +22694,32 @@
return 0;
}
_ACEOF
@@ -67567,7 +67558,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -60767,63 +22722,32 @@
+@@ -60775,63 +22730,32 @@
return 0;
}
_ACEOF
@@ -67640,7 +67631,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -60834,63 +22758,32 @@
+@@ -60842,63 +22766,32 @@
return 0;
}
_ACEOF
@@ -67713,7 +67704,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -60901,147 +22794,30 @@
+@@ -60909,147 +22802,30 @@
return 0;
}
_ACEOF
@@ -67871,7 +67862,7 @@
_ACEOF
fi
-@@ -61053,20 +22829,16 @@
+@@ -61061,20 +22837,16 @@
seteuid=no;
if test $seteuid = no; then
@@ -67896,7 +67887,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -61074,50 +22846,21 @@
+@@ -61082,50 +22854,21 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -67953,7 +67944,7 @@
fi
fi
-@@ -61125,20 +22868,16 @@
+@@ -61133,20 +22876,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
@@ -67978,7 +67969,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -61146,69 +22885,36 @@
+@@ -61154,69 +22893,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -68058,7 +68049,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -61216,69 +22922,36 @@
+@@ -61224,69 +22930,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -68138,7 +68129,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -61286,64 +22959,31 @@
+@@ -61294,64 +22967,31 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -68212,7 +68203,7 @@
/* end confdefs.h. */
#include <sys/syscall.h>
-@@ -61357,195 +22997,98 @@
+@@ -61365,195 +23005,98 @@
return 0;
}
_ACEOF
@@ -68443,7 +68434,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -61569,67 +23112,34 @@
+@@ -61577,67 +23120,34 @@
#endif
}
_ACEOF
@@ -68520,7 +68511,7 @@
/* end confdefs.h. */
#define _XOPEN_SOURCE 600
-@@ -61647,56 +23157,29 @@
+@@ -61655,56 +23165,29 @@
return 0;
}
_ACEOF
@@ -68584,7 +68575,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -61709,141 +23192,24 @@
+@@ -61717,141 +23200,24 @@
return 0;
}
_ACEOF
@@ -68733,7 +68724,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BLKSIZE_T 1
-@@ -61851,103 +23217,9 @@
+@@ -61859,103 +23225,9 @@
fi
@@ -68840,7 +68831,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BLKCNT_T 1
-@@ -61957,17 +23229,13 @@
+@@ -61965,17 +23237,13 @@
fi
@@ -68861,7 +68852,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -61980,55 +23248,28 @@
+@@ -61988,55 +23256,28 @@
return 0;
}
_ACEOF
@@ -68924,7 +68915,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -62041,57 +23282,30 @@
+@@ -62049,57 +23290,30 @@
return 0;
}
_ACEOF
@@ -68989,7 +68980,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -62107,58 +23321,31 @@
+@@ -62115,58 +23329,31 @@
return 0;
}
_ACEOF
@@ -69056,7 +69047,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -62177,74 +23364,45 @@
+@@ -62185,74 +23372,45 @@
}
_ACEOF
@@ -69142,7 +69133,7 @@
$as_echo "no" >&6; }
fi
-@@ -62253,24 +23411,24 @@
+@@ -62261,24 +23419,24 @@
####################################################
# check for Linux-specific AFS fake-kaserver support
samba_cv_WITH_FAKE_KASERVER=no
@@ -69172,7 +69163,7 @@
$as_echo "no" >&6; }
fi
-@@ -62282,18 +23440,14 @@
+@@ -62290,18 +23448,14 @@
test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
# see if this box has the OpenSSL DES libraries
@@ -69194,7 +69185,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62311,208 +23465,43 @@
+@@ -62319,208 +23473,43 @@
return 0;
}
_ACEOF
@@ -69419,7 +69410,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -62524,12 +23513,10 @@
+@@ -62532,12 +23521,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
@@ -69434,7 +69425,7 @@
fi
else
have_afs_headers=yes
-@@ -62539,9 +23526,7 @@
+@@ -62547,9 +23534,7 @@
FAKE_KASERVER_OBJ=""
if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
@@ -69445,7 +69436,7 @@
FAKE_KASERVER_OBJ="utils/net_afs.o"
fi
-@@ -62550,24 +23535,24 @@
+@@ -62558,24 +23543,24 @@
#################################################
# check whether to compile AFS/NT ACL mapping module
samba_cv_WITH_VFS_AFSACL=no
@@ -69475,7 +69466,7 @@
$as_echo "no" >&6; }
fi
-@@ -62579,36 +23564,32 @@
+@@ -62587,36 +23572,32 @@
if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
@@ -69519,7 +69510,7 @@
$as_echo "no" >&6; }
fi
-@@ -62618,12 +23599,12 @@
+@@ -62626,12 +23607,12 @@
# Compile with LDAP support?
with_ldap_support=auto
@@ -69534,7 +69525,7 @@
withval=$with_ldap; case "$withval" in
yes|no)
with_ldap_support=$withval
-@@ -62632,7 +23613,7 @@
+@@ -62640,7 +23621,7 @@
fi
@@ -69543,7 +69534,7 @@
$as_echo "$with_ldap_support" >&6; }
SMBLDAP=""
-@@ -62647,150 +23628,12 @@
+@@ -62655,150 +23636,12 @@
##################################################################
# first test for ldap.h and lber.h
# (ldap.h is required for this test)
@@ -69700,7 +69691,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -62802,11 +23645,9 @@
+@@ -62810,11 +23653,9 @@
if test x"$ac_cv_header_ldap_h" != x"yes"; then
if test x"$with_ldap_support" = x"yes"; then
@@ -69714,7 +69705,7 @@
$as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
fi
-@@ -62818,117 +23659,24 @@
+@@ -62826,117 +23667,24 @@
# unsigned int in include/includes.h
case $host_os in
*hpux*)
@@ -69839,7 +69830,7 @@
$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
fi
with_ldap_support=no
-@@ -62945,23 +23693,17 @@
+@@ -62953,23 +23701,17 @@
# this test must be before the libldap test
@@ -69866,7 +69857,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62979,54 +23721,28 @@
+@@ -62987,54 +23729,28 @@
return 0;
}
_ACEOF
@@ -69928,7 +69919,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLBER 1
_ACEOF
-@@ -63042,25 +23758,19 @@
+@@ -63050,25 +23766,19 @@
fi
@@ -69957,7 +69948,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. */
-@@ -63101,61 +23811,31 @@
+@@ -63109,61 +23819,31 @@
return 0;
}
_ACEOF
@@ -70028,7 +70019,7 @@
/* end confdefs.h. */
#include <ldap.h>
int
-@@ -63166,105 +23846,55 @@
+@@ -63174,105 +23854,55 @@
return 0;
}
_ACEOF
@@ -70149,7 +70140,7 @@
fi
-@@ -63272,23 +23902,17 @@
+@@ -63280,23 +23910,17 @@
# now see if we can find the ldap libs in standard paths
@@ -70176,7 +70167,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63306,54 +23930,28 @@
+@@ -63314,54 +23938,28 @@
return 0;
}
_ACEOF
@@ -70238,7 +70229,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLDAP 1
_ACEOF
-@@ -63369,25 +23967,19 @@
+@@ -63377,25 +23975,19 @@
fi
@@ -70267,7 +70258,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. */
-@@ -63428,62 +24020,32 @@
+@@ -63436,62 +24028,32 @@
return 0;
}
_ACEOF
@@ -70339,7 +70330,7 @@
/* end confdefs.h. */
#include <lber.h>
-@@ -63496,37 +24058,16 @@
+@@ -63504,37 +24066,16 @@
return 0;
}
_ACEOF
@@ -70380,7 +70371,7 @@
$as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
-@@ -63537,19 +24078,14 @@
+@@ -63545,19 +24086,14 @@
@@ -70403,7 +70394,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. */
-@@ -63590,55 +24126,27 @@
+@@ -63598,55 +24134,27 @@
return 0;
}
_ACEOF
@@ -70466,7 +70457,7 @@
CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -63646,17 +24154,15 @@
+@@ -63654,17 +24162,15 @@
SMBLDAP="lib/smbldap.o"
SMBLDAPUTIL="lib/smbldap_util.o"
with_ldap_support=yes
@@ -70488,7 +70479,7 @@
$as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
fi
-@@ -63671,12 +24177,12 @@
+@@ -63679,12 +24185,12 @@
# active directory support
with_ads_support=auto
@@ -70503,7 +70494,7 @@
withval=$with_ads; case "$withval" in
yes|no)
with_ads_support="$withval"
-@@ -63685,7 +24191,7 @@
+@@ -63693,7 +24199,7 @@
fi
@@ -70512,7 +70503,7 @@
$as_echo "$with_ads_support" >&6; }
FOUND_KRB5=no
-@@ -63694,11 +24200,9 @@
+@@ -63702,11 +24208,9 @@
if test x"$with_ldap_support" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -70526,7 +70517,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
with_ads_support=no
fi
-@@ -63713,19 +24217,14 @@
+@@ -63721,19 +24225,14 @@
*hpux*)
@@ -70549,7 +70540,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. */
-@@ -63766,57 +24265,29 @@
+@@ -63774,57 +24273,29 @@
return 0;
}
_ACEOF
@@ -70615,7 +70606,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
with_ads_support=no
fi
-@@ -63825,19 +24296,14 @@
+@@ -63833,19 +24304,14 @@
*)
@@ -70638,7 +70629,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. */
-@@ -63878,57 +24344,29 @@
+@@ -63886,57 +24352,29 @@
return 0;
}
_ACEOF
@@ -70704,7 +70695,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
with_ads_support=no
fi
-@@ -63939,19 +24377,14 @@
+@@ -63947,19 +24385,14 @@
@@ -70727,7 +70718,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. */
-@@ -63992,57 +24425,29 @@
+@@ -64000,57 +24433,29 @@
return 0;
}
_ACEOF
@@ -70793,7 +70784,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
with_ads_support=no
fi
-@@ -64058,23 +24463,23 @@
+@@ -64066,23 +24471,23 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# check for location of Kerberos 5 install
@@ -70822,7 +70813,7 @@
$as_echo "$withval" >&6; }
KRB5_CFLAGS="-I$withval/include"
KRB5_CPPFLAGS="-I$withval/include"
-@@ -64086,7 +24491,7 @@
+@@ -64094,7 +24499,7 @@
;;
esac
else
@@ -70831,7 +70822,7 @@
$as_echo "no krb5-path given" >&6; }
fi
-@@ -64097,9 +24502,9 @@
+@@ -64105,9 +24510,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
@@ -70843,7 +70834,7 @@
$as_echo_n "(cached) " >&6
else
case $KRB5CONFIG in
-@@ -64112,14 +24517,14 @@
+@@ -64120,14 +24525,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -70861,7 +70852,7 @@
IFS=$as_save_IFS
;;
-@@ -64127,15 +24532,15 @@
+@@ -64135,15 +24540,15 @@
fi
KRB5CONFIG=$ac_cv_path_KRB5CONFIG
if test -n "$KRB5CONFIG"; then
@@ -70880,7 +70871,7 @@
$as_echo_n "checking for working krb5-config... " >&6; }
if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then
ac_save_CFLAGS=$CFLAGS
-@@ -64149,17 +24554,17 @@
+@@ -64157,17 +24562,17 @@
CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes
@@ -70901,7 +70892,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
-@@ -64167,17 +24572,17 @@
+@@ -64175,17 +24580,17 @@
KRB5_CPPFLAGS="-I/usr/include/heimdal"
KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
FOUND_KRB5=yes
@@ -70922,7 +70913,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -64185,17 +24590,17 @@
+@@ -64193,17 +24598,17 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the RedHat location for kerberos
@@ -70943,7 +70934,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -64203,16 +24608,16 @@
+@@ -64211,16 +24616,16 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the OpenBSD location for heimdal krb5
@@ -70963,7 +70954,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -64299,151 +24704,12 @@
+@@ -64307,151 +24712,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
@@ -71120,7 +71111,7 @@
_ACEOF
fi
-@@ -64457,11 +24723,9 @@
+@@ -64465,11 +24731,9 @@
# i.e with_ads_support = auto, otherwise die with an error.
if test x"$with_ads_support" = x"yes"; then
@@ -71134,7 +71125,7 @@
$as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
fi
-@@ -64473,65 +24737,16 @@
+@@ -64481,65 +24745,16 @@
CPPFLAGS=$ac_save_CPPFLAGS
LDFLAGS=$ac_save_LDFLAGS
fi
@@ -71206,7 +71197,7 @@
_ACEOF
fi
-@@ -64548,17 +24763,13 @@
+@@ -64556,17 +24771,13 @@
# check for new heimdal KRB5_DEPRECATED handling
@@ -71227,7 +71218,7 @@
/* end confdefs.h. */
#define KRB5_DEPRECATED 1
#include <krb5.h>
-@@ -64570,42 +24781,19 @@
+@@ -64578,42 +24789,19 @@
return 0;
}
_ACEOF
@@ -71274,7 +71265,7 @@
fi
fi
-@@ -64619,152 +24807,12 @@
+@@ -64627,152 +24815,12 @@
# now check for gssapi headers. This is also done here to allow for
# different kerberos include paths
@@ -71433,7 +71424,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -64778,23 +24826,17 @@
+@@ -64786,23 +24834,17 @@
# we might need the k5crypto and com_err libraries on some systems
@@ -71460,7 +71451,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -64812,54 +24854,28 @@
+@@ -64820,54 +24862,28 @@
return 0;
}
_ACEOF
@@ -71522,7 +71513,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCOM_ERR 1
_ACEOF
-@@ -64876,24 +24892,17 @@
+@@ -64884,24 +24900,17 @@
fi
@@ -71550,7 +71541,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -64911,54 +24920,28 @@
+@@ -64919,54 +24928,28 @@
return 0;
}
_ACEOF
@@ -71612,7 +71603,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBK5CRYPTO 1
_ACEOF
-@@ -64974,27 +24957,20 @@
+@@ -64982,27 +24965,20 @@
fi
@@ -71643,7 +71634,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -65012,54 +24988,28 @@
+@@ -65020,54 +24996,28 @@
return 0;
}
_ACEOF
@@ -71705,7 +71696,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
-@@ -65076,24 +25026,17 @@
+@@ -65084,24 +25034,17 @@
fi
@@ -71733,7 +71724,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -65111,54 +25054,28 @@
+@@ -65119,54 +25062,28 @@
return 0;
}
_ACEOF
@@ -71795,7 +71786,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBASN1 1
_ACEOF
-@@ -65175,24 +25092,17 @@
+@@ -65183,24 +25100,17 @@
fi
@@ -71823,7 +71814,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -65210,54 +25120,28 @@
+@@ -65218,54 +25128,28 @@
return 0;
}
_ACEOF
@@ -71885,7 +71876,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBROKEN 1
_ACEOF
-@@ -65273,27 +25157,20 @@
+@@ -65281,27 +25165,20 @@
fi
@@ -71916,7 +71907,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -65311,54 +25188,28 @@
+@@ -65319,54 +25196,28 @@
return 0;
}
_ACEOF
@@ -71978,7 +71969,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI 1
_ACEOF
-@@ -65374,29 +25225,22 @@
+@@ -65382,29 +25233,22 @@
fi
@@ -72011,7 +72002,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -65414,54 +25258,28 @@
+@@ -65422,54 +25266,28 @@
return 0;
}
_ACEOF
@@ -72073,7 +72064,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -65478,24 +25296,17 @@
+@@ -65486,24 +25304,17 @@
fi
@@ -72101,7 +72092,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -65513,54 +25324,28 @@
+@@ -65521,54 +25332,28 @@
return 0;
}
_ACEOF
@@ -72163,7 +72154,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -65576,29 +25361,22 @@
+@@ -65584,29 +25369,22 @@
fi
@@ -72196,7 +72187,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -65616,54 +25394,28 @@
+@@ -65624,54 +25402,28 @@
return 0;
}
_ACEOF
@@ -72258,7 +72249,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI_KRB5 1
_ACEOF
-@@ -65678,24 +25430,18 @@
+@@ -65686,24 +25438,18 @@
have_gssapi=yes
fi
@@ -72286,7 +72277,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. */
-@@ -65736,43 +25482,18 @@
+@@ -65744,43 +25490,18 @@
return 0;
}
_ACEOF
@@ -72336,7 +72327,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_REAL_TIME 1
_ACEOF
-@@ -65780,20 +25501,14 @@
+@@ -65788,20 +25509,14 @@
fi
@@ -72360,7 +72351,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. */
-@@ -65834,43 +25549,18 @@
+@@ -65842,43 +25557,18 @@
return 0;
}
_ACEOF
@@ -72412,7 +72403,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -65878,20 +25568,14 @@
+@@ -65886,20 +25576,14 @@
fi
@@ -72436,7 +72427,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. */
-@@ -65932,43 +25616,18 @@
+@@ -65940,43 +25624,18 @@
return 0;
}
_ACEOF
@@ -72486,7 +72477,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
_ACEOF
-@@ -65976,20 +25635,14 @@
+@@ -65984,20 +25643,14 @@
fi
@@ -72510,7 +72501,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. */
-@@ -66030,43 +25683,18 @@
+@@ -66038,43 +25691,18 @@
return 0;
}
_ACEOF
@@ -72560,7 +72551,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
_ACEOF
-@@ -66074,20 +25702,14 @@
+@@ -66082,20 +25710,14 @@
fi
@@ -72584,7 +72575,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. */
-@@ -66128,43 +25750,18 @@
+@@ -66136,43 +25758,18 @@
return 0;
}
_ACEOF
@@ -72634,7 +72625,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL2SALT 1
_ACEOF
-@@ -66172,20 +25769,14 @@
+@@ -66180,20 +25777,14 @@
fi
@@ -72658,7 +72649,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. */
-@@ -66226,43 +25817,18 @@
+@@ -66234,43 +25825,18 @@
return 0;
}
_ACEOF
@@ -72708,7 +72699,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_USE_ENCTYPE 1
_ACEOF
-@@ -66270,20 +25836,14 @@
+@@ -66278,20 +25844,14 @@
fi
@@ -72732,7 +72723,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. */
-@@ -66324,43 +25884,18 @@
+@@ -66332,43 +25892,18 @@
return 0;
}
_ACEOF
@@ -72782,7 +72773,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY 1
_ACEOF
-@@ -66368,20 +25903,14 @@
+@@ -66376,20 +25911,14 @@
fi
@@ -72806,7 +72797,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. */
-@@ -66422,43 +25951,18 @@
+@@ -66430,43 +25959,18 @@
return 0;
}
_ACEOF
@@ -72856,7 +72847,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PW_SALT 1
_ACEOF
-@@ -66466,20 +25970,14 @@
+@@ -66474,20 +25978,14 @@
fi
@@ -72880,7 +72871,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. */
-@@ -66520,43 +26018,18 @@
+@@ -66528,43 +26026,18 @@
return 0;
}
_ACEOF
@@ -72930,7 +72921,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY_SALT 1
_ACEOF
-@@ -66564,20 +26037,14 @@
+@@ -66572,20 +26045,14 @@
fi
@@ -72954,7 +72945,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. */
-@@ -66618,43 +26085,18 @@
+@@ -66626,43 +26093,18 @@
return 0;
}
_ACEOF
@@ -73004,7 +72995,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETKEY 1
_ACEOF
-@@ -66662,20 +26104,14 @@
+@@ -66670,20 +26112,14 @@
fi
@@ -73028,7 +73019,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. */
-@@ -66716,43 +26152,18 @@
+@@ -66724,43 +26160,18 @@
return 0;
}
_ACEOF
@@ -73078,7 +73069,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
_ACEOF
-@@ -66760,20 +26171,14 @@
+@@ -66768,20 +26179,14 @@
fi
@@ -73102,7 +73093,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. */
-@@ -66814,43 +26219,18 @@
+@@ -66822,43 +26227,18 @@
return 0;
}
_ACEOF
@@ -73152,7 +73143,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_LOCATE_KDC 1
_ACEOF
-@@ -66858,20 +26238,14 @@
+@@ -66866,20 +26246,14 @@
fi
@@ -73176,7 +73167,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. */
-@@ -66912,43 +26286,18 @@
+@@ -66920,43 +26294,18 @@
return 0;
}
_ACEOF
@@ -73226,7 +73217,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
_ACEOF
-@@ -66956,20 +26305,14 @@
+@@ -66964,20 +26313,14 @@
fi
@@ -73250,7 +73241,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. */
-@@ -67010,43 +26353,18 @@
+@@ -67018,43 +26361,18 @@
return 0;
}
_ACEOF
@@ -73300,7 +73291,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -67054,20 +26372,14 @@
+@@ -67062,20 +26380,14 @@
fi
@@ -73324,7 +73315,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. */
-@@ -67108,43 +26420,18 @@
+@@ -67116,43 +26428,18 @@
return 0;
}
_ACEOF
@@ -73374,7 +73365,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_DATA_CONTENTS 1
_ACEOF
-@@ -67152,20 +26439,14 @@
+@@ -67160,20 +26447,14 @@
fi
@@ -73398,7 +73389,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. */
-@@ -67206,43 +26487,18 @@
+@@ -67214,43 +26495,18 @@
return 0;
}
_ACEOF
@@ -73448,7 +73439,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
_ACEOF
-@@ -67250,20 +26506,14 @@
+@@ -67258,20 +26514,14 @@
fi
@@ -73472,7 +73463,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. */
-@@ -67304,43 +26554,18 @@
+@@ -67312,43 +26562,18 @@
return 0;
}
_ACEOF
@@ -73522,7 +73513,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_UNPARSED_NAME 1
_ACEOF
-@@ -67348,20 +26573,14 @@
+@@ -67356,20 +26581,14 @@
fi
@@ -73546,7 +73537,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. */
-@@ -67402,43 +26621,18 @@
+@@ -67410,43 +26629,18 @@
return 0;
}
_ACEOF
@@ -73596,7 +73587,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
_ACEOF
-@@ -67446,20 +26640,14 @@
+@@ -67454,20 +26648,14 @@
fi
@@ -73620,7 +73611,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. */
-@@ -67500,43 +26688,18 @@
+@@ -67508,43 +26696,18 @@
return 0;
}
_ACEOF
@@ -73670,7 +73661,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KT_FREE_ENTRY 1
_ACEOF
-@@ -67544,20 +26707,14 @@
+@@ -67552,20 +26715,14 @@
fi
@@ -73694,7 +73685,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. */
-@@ -67598,43 +26755,18 @@
+@@ -67606,43 +26763,18 @@
return 0;
}
_ACEOF
@@ -73744,7 +73735,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_INIT 1
_ACEOF
-@@ -67642,20 +26774,14 @@
+@@ -67650,20 +26782,14 @@
fi
@@ -73768,7 +73759,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. */
-@@ -67696,43 +26822,18 @@
+@@ -67704,43 +26830,18 @@
return 0;
}
_ACEOF
@@ -73818,7 +73809,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
_ACEOF
-@@ -67740,20 +26841,14 @@
+@@ -67748,20 +26849,14 @@
fi
@@ -73842,7 +73833,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. */
-@@ -67794,43 +26889,18 @@
+@@ -67802,43 +26897,18 @@
return 0;
}
_ACEOF
@@ -73892,7 +73883,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_ENCTYPE_COMPARE 1
_ACEOF
-@@ -67838,20 +26908,14 @@
+@@ -67846,20 +26916,14 @@
fi
@@ -73916,7 +73907,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. */
-@@ -67892,43 +26956,18 @@
+@@ -67900,43 +26964,18 @@
return 0;
}
_ACEOF
@@ -73966,7 +73957,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
_ACEOF
-@@ -67936,20 +26975,14 @@
+@@ -67944,20 +26983,14 @@
fi
@@ -73990,7 +73981,7 @@
/* end confdefs.h. */
/* Define krb5_crypto_init to an innocuous variant, in case <limits.h> declares krb5_crypto_init.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -67990,43 +27023,18 @@
+@@ -67998,43 +27031,18 @@
return 0;
}
_ACEOF
@@ -74040,7 +74031,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_INIT 1
_ACEOF
-@@ -68034,20 +27042,14 @@
+@@ -68042,20 +27050,14 @@
fi
@@ -74064,7 +74055,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. */
-@@ -68088,43 +27090,18 @@
+@@ -68096,43 +27098,18 @@
return 0;
}
_ACEOF
@@ -74114,7 +74105,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_DESTROY 1
_ACEOF
-@@ -68132,20 +27109,14 @@
+@@ -68140,20 +27117,14 @@
fi
@@ -74138,7 +74129,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. */
-@@ -68186,43 +27157,18 @@
+@@ -68194,43 +27165,18 @@
return 0;
}
_ACEOF
@@ -74188,7 +74179,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_DECODE_AP_REQ 1
_ACEOF
-@@ -68230,20 +27176,14 @@
+@@ -68238,20 +27184,14 @@
fi
@@ -74212,7 +74203,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. */
-@@ -68284,43 +27224,18 @@
+@@ -68292,43 +27232,18 @@
return 0;
}
_ACEOF
@@ -74262,7 +74253,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_FREE_AP_REQ 1
_ACEOF
-@@ -68328,20 +27243,14 @@
+@@ -68336,20 +27251,14 @@
fi
@@ -74286,7 +74277,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. */
-@@ -68382,43 +27291,18 @@
+@@ -68390,43 +27299,18 @@
return 0;
}
_ACEOF
@@ -74336,7 +74327,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_VERIFY_CHECKSUM 1
_ACEOF
-@@ -68426,20 +27310,14 @@
+@@ -68434,20 +27318,14 @@
fi
@@ -74360,7 +74351,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. */
-@@ -68480,43 +27358,18 @@
+@@ -68488,43 +27366,18 @@
return 0;
}
_ACEOF
@@ -74410,7 +74401,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_VERIFY_CHECKSUM 1
_ACEOF
-@@ -68524,20 +27377,14 @@
+@@ -68532,20 +27385,14 @@
fi
@@ -74434,7 +74425,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. */
-@@ -68578,43 +27425,18 @@
+@@ -68586,43 +27433,18 @@
return 0;
}
_ACEOF
@@ -74484,7 +74475,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
_ACEOF
-@@ -68622,20 +27444,14 @@
+@@ -68630,20 +27452,14 @@
fi
@@ -74508,7 +74499,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. */
-@@ -68676,43 +27492,18 @@
+@@ -68684,43 +27500,18 @@
return 0;
}
_ACEOF
@@ -74558,7 +74549,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PARSE_NAME_NOREALM 1
_ACEOF
-@@ -68720,20 +27511,14 @@
+@@ -68728,20 +27519,14 @@
fi
@@ -74582,7 +74573,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. */
-@@ -68774,43 +27559,18 @@
+@@ -68782,43 +27567,18 @@
return 0;
}
_ACEOF
@@ -74632,7 +74623,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINC_SIZE 1
_ACEOF
-@@ -68818,20 +27578,14 @@
+@@ -68826,20 +27586,14 @@
fi
@@ -74656,7 +74647,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. */
-@@ -68872,43 +27626,18 @@
+@@ -68880,43 +27634,18 @@
return 0;
}
_ACEOF
@@ -74706,7 +74697,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
_ACEOF
-@@ -68916,20 +27645,14 @@
+@@ -68924,20 +27653,14 @@
fi
@@ -74730,7 +74721,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. */
-@@ -68970,43 +27693,18 @@
+@@ -68978,43 +27701,18 @@
return 0;
}
_ACEOF
@@ -74780,7 +74771,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_RENEWED_CREDS 1
_ACEOF
-@@ -69014,20 +27712,14 @@
+@@ -69022,20 +27720,14 @@
fi
@@ -74804,7 +74795,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. */
-@@ -69068,43 +27760,18 @@
+@@ -69076,43 +27768,18 @@
return 0;
}
_ACEOF
@@ -74854,7 +74845,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_KDC_CRED 1
_ACEOF
-@@ -69112,20 +27779,14 @@
+@@ -69120,20 +27787,14 @@
fi
@@ -74878,7 +74869,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. */
-@@ -69166,43 +27827,18 @@
+@@ -69174,43 +27835,18 @@
return 0;
}
_ACEOF
@@ -74928,7 +74919,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_ERROR_CONTENTS 1
_ACEOF
-@@ -69210,20 +27846,14 @@
+@@ -69218,20 +27854,14 @@
fi
@@ -74952,7 +74943,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. */
-@@ -69264,43 +27894,18 @@
+@@ -69272,43 +27902,18 @@
return 0;
}
_ACEOF
@@ -75002,7 +74993,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
_ACEOF
-@@ -69308,20 +27913,14 @@
+@@ -69316,20 +27921,14 @@
fi
@@ -75026,7 +75017,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. */
-@@ -69362,43 +27961,18 @@
+@@ -69370,43 +27969,18 @@
return 0;
}
_ACEOF
@@ -75076,7 +75067,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
_ACEOF
-@@ -69406,20 +27980,14 @@
+@@ -69414,20 +27988,14 @@
fi
@@ -75100,7 +75091,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. */
-@@ -69460,43 +28028,18 @@
+@@ -69468,43 +28036,18 @@
return 0;
}
_ACEOF
@@ -75150,7 +75141,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
_ACEOF
-@@ -69504,20 +28047,14 @@
+@@ -69512,20 +28055,14 @@
fi
@@ -75174,7 +75165,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. */
-@@ -69558,43 +28095,18 @@
+@@ -69566,43 +28103,18 @@
return 0;
}
_ACEOF
@@ -75224,7 +75215,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
_ACEOF
-@@ -69602,20 +28114,14 @@
+@@ -69610,20 +28122,14 @@
fi
@@ -75248,7 +75239,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. */
-@@ -69656,43 +28162,18 @@
+@@ -69664,43 +28170,18 @@
return 0;
}
_ACEOF
@@ -75298,7 +75289,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPE_TO_STRING 1
_ACEOF
-@@ -69700,20 +28181,14 @@
+@@ -69708,20 +28189,14 @@
fi
@@ -75322,7 +75313,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. */
-@@ -69754,43 +28229,18 @@
+@@ -69762,43 +28237,18 @@
return 0;
}
_ACEOF
@@ -75372,7 +75363,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FWD_TGT_CREDS 1
_ACEOF
-@@ -69798,20 +28248,14 @@
+@@ -69806,20 +28256,14 @@
fi
@@ -75396,7 +75387,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. */
-@@ -69852,43 +28296,18 @@
+@@ -69860,43 +28304,18 @@
return 0;
}
_ACEOF
@@ -75446,7 +75437,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
_ACEOF
-@@ -69896,20 +28315,14 @@
+@@ -69904,20 +28323,14 @@
fi
@@ -75470,7 +75461,7 @@
/* end confdefs.h. */
/* Define krb5_get_creds_opt_alloc to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_alloc.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -69950,43 +28363,18 @@
+@@ -69958,43 +28371,18 @@
return 0;
}
_ACEOF
@@ -75520,7 +75511,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_CREDS_OPT_ALLOC 1
_ACEOF
-@@ -69994,20 +28382,14 @@
+@@ -70002,20 +28390,14 @@
fi
@@ -75544,7 +75535,7 @@
/* end confdefs.h. */
/* Define krb5_get_creds_opt_set_impersonate to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_set_impersonate.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -70048,43 +28430,18 @@
+@@ -70056,43 +28438,18 @@
return 0;
}
_ACEOF
@@ -75594,7 +75585,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE 1
_ACEOF
-@@ -70092,20 +28449,14 @@
+@@ -70100,20 +28457,14 @@
fi
@@ -75618,7 +75609,7 @@
/* end confdefs.h. */
/* Define krb5_get_creds to an innocuous variant, in case <limits.h> declares krb5_get_creds.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -70146,43 +28497,18 @@
+@@ -70154,43 +28505,18 @@
return 0;
}
_ACEOF
@@ -75668,7 +75659,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_CREDS 1
_ACEOF
-@@ -70190,20 +28516,14 @@
+@@ -70198,20 +28524,14 @@
fi
@@ -75692,7 +75683,7 @@
/* end confdefs.h. */
/* Define krb5_get_credentials_for_user to an innocuous variant, in case <limits.h> declares krb5_get_credentials_for_user.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-@@ -70244,207 +28564,61 @@
+@@ -70252,207 +28572,61 @@
return 0;
}
_ACEOF
@@ -75921,7 +75912,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -70464,57 +28638,30 @@
+@@ -70472,57 +28646,30 @@
return 0;
}
_ACEOF
@@ -75986,7 +75977,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -70530,58 +28677,31 @@
+@@ -70538,58 +28685,31 @@
return 0;
}
_ACEOF
@@ -76052,7 +76043,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -70593,36 +28713,15 @@
+@@ -70601,36 +28721,15 @@
return 0;
}
_ACEOF
@@ -76092,7 +76083,7 @@
$as_echo "$smb_krb5_cv_verify_checksum" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -70630,17 +28729,13 @@
+@@ -70638,17 +28737,13 @@
_ACEOF
@@ -76113,7 +76104,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -70651,56 +28746,29 @@
+@@ -70659,56 +28754,29 @@
return 0;
}
_ACEOF
@@ -76177,7 +76168,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -70711,56 +28779,29 @@
+@@ -70719,56 +28787,29 @@
return 0;
}
_ACEOF
@@ -76241,7 +76232,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -70771,56 +28812,29 @@
+@@ -70779,56 +28820,29 @@
return 0;
}
_ACEOF
@@ -76305,7 +76296,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -70831,56 +28845,29 @@
+@@ -70839,56 +28853,29 @@
return 0;
}
_ACEOF
@@ -76369,7 +76360,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -70891,56 +28878,29 @@
+@@ -70899,56 +28886,29 @@
return 0;
}
_ACEOF
@@ -76433,7 +76424,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -70951,56 +28911,29 @@
+@@ -70959,56 +28919,29 @@
return 0;
}
_ACEOF
@@ -76497,7 +76488,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71011,56 +28944,29 @@
+@@ -71019,56 +28952,29 @@
return 0;
}
_ACEOF
@@ -76561,7 +76552,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71071,55 +28977,28 @@
+@@ -71079,55 +28985,28 @@
return 0;
}
_ACEOF
@@ -76624,7 +76615,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71130,56 +29009,29 @@
+@@ -71138,56 +29017,29 @@
return 0;
}
_ACEOF
@@ -76688,7 +76679,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71190,56 +29042,29 @@
+@@ -71198,56 +29050,29 @@
return 0;
}
_ACEOF
@@ -76752,7 +76743,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71250,56 +29075,29 @@
+@@ -71258,56 +29083,29 @@
return 0;
}
_ACEOF
@@ -76816,7 +76807,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71310,56 +29108,29 @@
+@@ -71318,56 +29116,29 @@
return 0;
}
_ACEOF
@@ -76880,7 +76871,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71370,47 +29141,22 @@
+@@ -71378,47 +29149,22 @@
return 0;
}
_ACEOF
@@ -76934,7 +76925,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71421,58 +29167,31 @@
+@@ -71429,58 +29175,31 @@
return 0;
}
_ACEOF
@@ -77000,7 +76991,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71483,56 +29202,29 @@
+@@ -71491,56 +29210,29 @@
return 0;
}
_ACEOF
@@ -77064,7 +77055,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71543,56 +29235,29 @@
+@@ -71551,56 +29243,29 @@
return 0;
}
_ACEOF
@@ -77128,7 +77119,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71603,56 +29268,29 @@
+@@ -71611,56 +29276,29 @@
return 0;
}
_ACEOF
@@ -77192,7 +77183,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71663,56 +29301,29 @@
+@@ -71671,56 +29309,29 @@
return 0;
}
_ACEOF
@@ -77256,7 +77247,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71723,61 +29334,30 @@
+@@ -71731,61 +29342,30 @@
return 0;
}
_ACEOF
@@ -77327,7 +77318,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71788,56 +29368,29 @@
+@@ -71796,56 +29376,29 @@
return 0;
}
_ACEOF
@@ -77391,7 +77382,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71848,56 +29401,29 @@
+@@ -71856,56 +29409,29 @@
return 0;
}
_ACEOF
@@ -77455,7 +77446,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71908,65 +29434,35 @@
+@@ -71916,65 +29442,35 @@
return 0;
}
_ACEOF
@@ -77532,7 +77523,7 @@
/* end confdefs.h. */
#include<krb5.h>
-@@ -71979,65 +29475,32 @@
+@@ -71987,65 +29483,32 @@
return krb5_kt_resolve(context, "WRFILE:api", &keytab);
}
_ACEOF
@@ -77607,7 +77598,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -72051,56 +29514,29 @@
+@@ -72059,56 +29522,29 @@
return 0;
}
_ACEOF
@@ -77671,7 +77662,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -72111,56 +29547,29 @@
+@@ -72119,56 +29555,29 @@
return 0;
}
_ACEOF
@@ -77735,7 +77726,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -72172,49 +29581,26 @@
+@@ -72180,49 +29589,26 @@
return 0;
}
_ACEOF
@@ -77791,7 +77782,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72228,20 +29614,13 @@
+@@ -72236,20 +29622,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -77817,7 +77808,7 @@
/* end confdefs.h. */
#include <stdlib.h>
-@@ -72255,42 +29634,15 @@
+@@ -72263,42 +29642,15 @@
}
_ACEOF
@@ -77864,7 +77855,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72302,20 +29654,18 @@
+@@ -72310,20 +29662,18 @@
export LDFLAGS;
fi
@@ -77889,7 +77880,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72329,20 +29679,13 @@
+@@ -72337,20 +29687,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -77915,7 +77906,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -72353,42 +29696,15 @@
+@@ -72361,42 +29704,15 @@
}
_ACEOF
@@ -77962,7 +77953,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72400,29 +29716,23 @@
+@@ -72408,29 +29724,23 @@
export LDFLAGS;
fi
@@ -77997,7 +77988,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -72433,61 +29743,30 @@
+@@ -72441,61 +29751,30 @@
return 0;
}
_ACEOF
@@ -78068,7 +78059,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -72498,47 +29777,20 @@
+@@ -72506,47 +29785,20 @@
return 0;
}
_ACEOF
@@ -78122,7 +78113,7 @@
fi
-@@ -72550,7 +29802,7 @@
+@@ -72558,7 +29810,7 @@
#
#
if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -78131,7 +78122,7 @@
$as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
use_ads=no
fi
-@@ -72558,7 +29810,7 @@
+@@ -72566,7 +29818,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
@@ -78140,7 +78131,7 @@
$as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -72566,7 +29818,7 @@
+@@ -72574,7 +29826,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
@@ -78149,7 +78140,7 @@
$as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -72574,7 +29826,7 @@
+@@ -72582,7 +29834,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
@@ -78158,7 +78149,7 @@
$as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -72582,7 +29834,7 @@
+@@ -72590,7 +29842,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
@@ -78167,7 +78158,7 @@
$as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -72594,14 +29846,14 @@
+@@ -72602,14 +29854,14 @@
if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
then
@@ -78184,7 +78175,7 @@
$as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -72610,29 +29862,21 @@
+@@ -72618,29 +29870,21 @@
if test x"$use_ads" = x"yes"; then
@@ -78219,7 +78210,7 @@
$as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
fi
-@@ -72658,9 +29902,9 @@
+@@ -72666,9 +29910,9 @@
KRB5_LIBS=""
with_ads_support=no
fi
@@ -78231,7 +78222,7 @@
$as_echo "$use_ads" >&6; }
LIBS="$ac_save_LIBS"
-@@ -72672,23 +29916,17 @@
+@@ -72680,23 +29924,17 @@
@@ -78258,7 +78249,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -72706,54 +29944,28 @@
+@@ -72714,54 +29952,28 @@
return 0;
}
_ACEOF
@@ -78320,7 +78311,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSCD 1
_ACEOF
-@@ -72768,7 +29980,6 @@
+@@ -72776,7 +29988,6 @@
fi
@@ -78328,7 +78319,7 @@
PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
-@@ -72776,12 +29987,12 @@
+@@ -72784,12 +29995,12 @@
# Compile with DNS Updates support?
with_dnsupdate_support=no
@@ -78343,7 +78334,7 @@
withval=$with_dnsupdate; case "$withval" in
yes|no)
with_dnsupdate_support=$withval
-@@ -72790,7 +30001,7 @@
+@@ -72798,7 +30009,7 @@
fi
@@ -78352,7 +78343,7 @@
$as_echo "$with_dnsupdate_support" >&6; }
if test x"$with_dnsupdate_support" != x"no"; then
-@@ -72804,151 +30015,12 @@
+@@ -72812,151 +30023,12 @@
##################################################################
# then test for uuid.h (necessary to generate unique DNS keynames
# (uuid.h is required for this test)
@@ -78509,7 +78500,7 @@
_ACEOF
fi
-@@ -72958,11 +30030,9 @@
+@@ -72966,11 +30038,9 @@
if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78523,7 +78514,7 @@
$as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -72978,102 +30048,12 @@
+@@ -72986,102 +30056,12 @@
UUID_LIBS=""
@@ -78631,7 +78622,7 @@
_ACEOF
# uuid_generate was found in libc or existing $LIBS
-@@ -73090,9 +30070,7 @@
+@@ -73098,9 +30078,7 @@
with_dnsupdate_support=yes
@@ -78642,7 +78633,7 @@
-@@ -73105,11 +30083,9 @@
+@@ -73113,11 +30091,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78656,7 +78647,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -73118,18 +30094,14 @@
+@@ -73126,18 +30102,14 @@
;;
*)
# uuid_generate was not found, try adding libuuid
@@ -78678,7 +78669,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -73147,43 +30119,18 @@
+@@ -73155,43 +30127,18 @@
return 0;
}
_ACEOF
@@ -78728,7 +78719,7 @@
LIBS="-luuid $LIBS"
-@@ -73199,9 +30146,7 @@
+@@ -73207,9 +30154,7 @@
with_dnsupdate_support=yes
@@ -78739,7 +78730,7 @@
-@@ -73211,11 +30156,9 @@
+@@ -73219,11 +30164,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -78753,7 +78744,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -73235,28 +30178,26 @@
+@@ -73243,28 +30186,26 @@
#################################################
# check for automount support
@@ -78788,7 +78779,7 @@
$as_echo "no" >&6; }
fi
-@@ -73267,34 +30208,30 @@
+@@ -73275,34 +30216,30 @@
CIFSMOUNT_PROGS=""
INSTALL_CIFSMOUNT=""
UNINSTALL_CIFSMOUNT=""
@@ -78829,7 +78820,7 @@
;;
esac
;;
-@@ -73302,19 +30239,17 @@
+@@ -73310,19 +30247,17 @@
else
case "$host_os" in
*linux*)
@@ -78852,7 +78843,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -73325,192 +30260,49 @@
+@@ -73333,192 +30268,49 @@
CIFSUMOUNT_PROGS=""
INSTALL_CIFSUMOUNT=""
UNINSTALL_CIFSUMOUNT=""
@@ -79061,7 +79052,7 @@
_ACEOF
HAVE_KEYUTILS_H=1
else
-@@ -73522,34 +30314,28 @@
+@@ -73530,34 +30322,28 @@
CIFSUPCALL_PROGS=""
INSTALL_CIFSUPCALL=""
UNINSTALL_CIFSUPCALL=""
@@ -79103,7 +79094,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -73557,9 +30343,7 @@
+@@ -73565,9 +30351,7 @@
fi
;;
*)
@@ -79114,7 +79105,7 @@
;;
esac
;;
-@@ -73568,18 +30352,16 @@
+@@ -73576,18 +30360,16 @@
case "$host_os" in
*linux*)
if test x"$use_ads" != x"yes"; then
@@ -79137,7 +79128,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -73587,7 +30369,7 @@
+@@ -73595,7 +30377,7 @@
fi
;;
*)
@@ -79146,7 +79137,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -73604,11 +30386,11 @@
+@@ -73612,11 +30394,11 @@
with_pam_for_crypt=no
try_pam=auto
@@ -79160,7 +79151,7 @@
withval=$with_pam; case "$withval" in
yes|no|auto)
try_pam=$withval
-@@ -73617,7 +30399,7 @@
+@@ -73625,7 +30407,7 @@
fi
@@ -79169,7 +79160,7 @@
$as_echo "$try_pam" >&6; }
use_pam=no
-@@ -73628,150 +30410,12 @@
+@@ -73636,150 +30418,12 @@
# Most systems have PAM headers in /usr/include/security, but Darwin
# has them in /usr/include/pam.
@@ -79326,7 +79317,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -73783,9 +30427,7 @@
+@@ -73791,9 +30435,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
@@ -79337,7 +79328,7 @@
fi
use_pam=no
create_pam_modules=no
-@@ -73793,23 +30435,17 @@
+@@ -73801,23 +30443,17 @@
@@ -79364,7 +79355,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -73827,54 +30463,28 @@
+@@ -73835,54 +30471,28 @@
return 0;
}
_ACEOF
@@ -79426,7 +79417,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -73889,34 +30499,18 @@
+@@ -73897,34 +30507,18 @@
fi
@@ -79466,7 +79457,7 @@
#if HAVE_SECURITY_PAM_APPL_H
#include <security/pam_appl.h>
#endif
-@@ -73924,44 +30518,9 @@
+@@ -73932,44 +30526,9 @@
#include <pam/pam_appl.h>
#endif
@@ -79514,7 +79505,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -73973,179 +30532,33 @@
+@@ -73981,179 +30540,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
@@ -79704,7 +79695,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -74154,150 +30567,12 @@
+@@ -74162,150 +30575,12 @@
done
@@ -79861,7 +79852,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -74308,19 +30583,14 @@
+@@ -74316,19 +30591,14 @@
@@ -79884,7 +79875,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. */
-@@ -74361,72 +30631,42 @@
+@@ -74369,72 +30639,42 @@
return 0;
}
_ACEOF
@@ -79969,7 +79960,7 @@
/* end confdefs.h. */
#if (!defined(LINUX))
-@@ -74464,36 +30704,11 @@
+@@ -74472,36 +30712,11 @@
return 0;
}
_ACEOF
@@ -80008,7 +79999,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
#################################################
-@@ -74503,19 +30718,17 @@
+@@ -74511,19 +30726,17 @@
UNINSTALL_PAM_MODULES=""
try_pam_smbpass=auto
@@ -80031,7 +80022,7 @@
;;
esac
-@@ -74529,16 +30742,12 @@
+@@ -74537,16 +30750,12 @@
# Conditions under which pam_smbpass can't be built.
if test x"$BLDSHARED" != xtrue ; then
if test x"${try_pam_smbpass}" = xyes ; then
@@ -80050,7 +80041,7 @@
fi
use_pam_smbpass=no
fi
-@@ -74549,7 +30758,7 @@
+@@ -74557,7 +30766,7 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
fi
@@ -80059,7 +80050,7 @@
$as_echo "$use_pam_smbpass" >&6; }
-@@ -74560,98 +30769,63 @@
+@@ -74568,98 +30777,63 @@
## $with_pam_for_crypt variable as above --jerry
##
if test $with_pam_for_crypt = no; then
@@ -80174,7 +80165,7 @@
$as_echo "no" >&6; }
fi
-@@ -74659,28 +30833,26 @@
+@@ -74667,28 +30841,26 @@
#################################################
# check for syslog logging
@@ -80209,7 +80200,7 @@
$as_echo "no" >&6; }
fi
-@@ -74688,16 +30860,14 @@
+@@ -74696,16 +30868,14 @@
#################################################
# check for custom syslog facility
@@ -80229,7 +80220,7 @@
else
if test "$withval" != "yes" ; then
syslog_facility="$withval"
-@@ -74722,14 +30892,14 @@
+@@ -74730,14 +30900,14 @@
samba_cv_TRY_SYS_QUOTAS=auto
samba_cv_SYSQUOTA_FOUND=no
@@ -80247,7 +80238,7 @@
$as_echo "yes" >&6; }
samba_cv_WITH_QUOTAS=yes
samba_cv_TRY_QUOTAS=yes
-@@ -74738,7 +30908,7 @@
+@@ -74746,7 +30916,7 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
auto)
@@ -80256,7 +80247,7 @@
$as_echo "auto" >&6; }
samba_cv_WITH_QUOTAS=auto
samba_cv_TRY_QUOTAS=auto
-@@ -74747,719 +30917,165 @@
+@@ -74755,719 +30925,165 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
no)
@@ -81062,7 +81053,7 @@
_ACEOF
fi
-@@ -75469,17 +31085,13 @@
+@@ -75477,17 +31093,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
@@ -81083,7 +81074,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -75499,35 +31111,14 @@
+@@ -75507,35 +31119,14 @@
return 0;
}
_ACEOF
@@ -81122,7 +81113,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
-@@ -75535,17 +31126,13 @@
+@@ -75543,17 +31134,13 @@
fi
# if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -81143,7 +81134,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -75563,41 +31150,18 @@
+@@ -75571,41 +31158,18 @@
return 0;
}
_ACEOF
@@ -81189,7 +81180,7 @@
fi
-@@ -75605,9 +31169,9 @@
+@@ -75613,9 +31177,9 @@
# look for a working quota system
if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -81201,7 +81192,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -75621,14 +31185,10 @@
+@@ -75629,14 +31193,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -81218,7 +81209,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4A 1
-@@ -75636,42 +31196,15 @@
+@@ -75644,42 +31204,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -81265,7 +81256,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -75683,23 +31216,21 @@
+@@ -75691,23 +31224,21 @@
export LDFLAGS;
fi
@@ -81293,7 +81284,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -75713,14 +31244,10 @@
+@@ -75721,14 +31252,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -81310,7 +81301,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4B 1
-@@ -75728,42 +31255,15 @@
+@@ -75736,42 +31263,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -81357,7 +81348,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -75775,24 +31275,22 @@
+@@ -75783,24 +31283,22 @@
export LDFLAGS;
fi
@@ -81386,7 +81377,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -75806,14 +31304,10 @@
+@@ -75814,14 +31312,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -81403,7 +81394,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_3 1
-@@ -75821,42 +31315,15 @@
+@@ -75829,42 +31323,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -81450,7 +81441,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -75868,15 +31335,13 @@
+@@ -75876,15 +31343,13 @@
export LDFLAGS;
fi
@@ -81468,7 +81459,7 @@
samba_cv_sysquotas_file="lib/sysquotas_3.c"
fi
-@@ -75884,151 +31349,12 @@
+@@ -75892,151 +31357,12 @@
#################################################
# check for mntent.h and struct mntent
@@ -81624,7 +81615,7 @@
_ACEOF
fi
-@@ -76037,102 +31363,12 @@
+@@ -76045,102 +31371,12 @@
#################################################
# check for setmntent,getmntent,endmntent
@@ -81732,7 +81723,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -76143,151 +31379,12 @@
+@@ -76151,151 +31387,12 @@
#################################################
# check for devnm.h and struct mntent
@@ -81888,7 +81879,7 @@
_ACEOF
fi
-@@ -76296,102 +31393,12 @@
+@@ -76304,102 +31401,12 @@
#################################################
# check for devnm
@@ -81995,7 +81986,7 @@
_ACEOF
fi
-@@ -76414,19 +31421,15 @@
+@@ -76422,19 +31429,15 @@
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -82018,7 +82009,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -76444,76 +31447,47 @@
+@@ -76452,76 +31455,47 @@
return 0;
}
_ACEOF
@@ -82106,7 +82097,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -76531,62 +31505,35 @@
+@@ -76539,62 +31513,35 @@
return 0;
}
_ACEOF
@@ -82176,7 +82167,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -76602,56 +31549,33 @@
+@@ -76610,56 +31557,33 @@
return 0;
}
_ACEOF
@@ -82241,7 +82232,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -76663,12 +31587,12 @@
+@@ -76671,12 +31595,12 @@
#################################################
# check for experimental utmp accounting
@@ -82256,7 +82247,7 @@
withval=$with_utmp; case "$withval" in
no)
WITH_UTMP=no
-@@ -76691,41 +31615,35 @@
+@@ -76699,41 +31623,35 @@
# Display test results
if test x"$WITH_UTMP" = x"yes"; then
@@ -82306,7 +82297,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -76739,51 +31657,22 @@
+@@ -76747,51 +31665,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -82364,7 +82355,7 @@
fi
fi
-@@ -76796,16 +31685,12 @@
+@@ -76804,16 +31693,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -82384,7 +82375,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -76817,47 +31702,20 @@
+@@ -76825,47 +31710,20 @@
return 0;
}
_ACEOF
@@ -82438,7 +82429,7 @@
fi
fi
-@@ -76865,17 +31723,13 @@
+@@ -76873,17 +31731,13 @@
# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
# This is not the case on ancient Linux systems.
@@ -82459,7 +82450,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -76887,57 +31741,30 @@
+@@ -76895,57 +31749,30 @@
return 0;
}
_ACEOF
@@ -82524,7 +82515,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -76949,56 +31776,29 @@
+@@ -76957,56 +31784,29 @@
return 0;
}
_ACEOF
@@ -82588,7 +82579,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -77010,55 +31810,28 @@
+@@ -77018,55 +31818,28 @@
return 0;
}
_ACEOF
@@ -82651,7 +82642,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -77070,59 +31843,32 @@
+@@ -77078,59 +31851,32 @@
return 0;
}
_ACEOF
@@ -82719,7 +82710,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -77135,71 +31881,38 @@
+@@ -77143,71 +31889,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -82801,7 +82792,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -77218,71 +31931,38 @@
+@@ -77226,71 +31939,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -82883,7 +82874,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -77292,71 +31972,38 @@
+@@ -77300,71 +31980,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -82965,7 +82956,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -77372,71 +32019,38 @@
+@@ -77380,71 +32027,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -83047,7 +83038,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -77456,52 +32070,23 @@
+@@ -77464,52 +32078,23 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -83106,7 +83097,7 @@
fi
fi
-@@ -77514,13 +32099,9 @@
+@@ -77522,13 +32107,9 @@
# If we don't have all of these then disable large
# file support.
#
@@ -83122,7 +83113,7 @@
/* end confdefs.h. */
#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -77537,41 +32118,18 @@
+@@ -77545,41 +32126,18 @@
return 0;
}
_ACEOF
@@ -83168,7 +83159,7 @@
$as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
#################################################
-@@ -77581,10 +32139,10 @@
+@@ -77589,10 +32147,10 @@
# Check whether --with-ctdb was given.
@@ -83181,7 +83172,7 @@
$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
;;
*)
-@@ -77598,71 +32156,23 @@
+@@ -77606,71 +32164,23 @@
CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
ctdb_broken="missing or broken headers"
@@ -83263,7 +83254,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -77673,17 +32183,13 @@
+@@ -77681,17 +32191,13 @@
@@ -83284,7 +83275,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -77704,41 +32210,18 @@
+@@ -77712,41 +32218,18 @@
return 0;
}
_ACEOF
@@ -83330,7 +83321,7 @@
fi
-@@ -77749,351 +32232,13 @@
+@@ -77757,351 +32240,13 @@
fi
@@ -83686,7 +83677,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -78106,116 +32251,109 @@
+@@ -78114,116 +32259,109 @@
#include <ctdb.h>
#include <ctdb_private.h>
@@ -83872,7 +83863,7 @@
withval=$with_cluster_support;
fi
-@@ -78226,44 +32364,38 @@
+@@ -78234,44 +32372,38 @@
if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
if test "x$with_cluster_support" = "xyes"; then
@@ -83924,7 +83915,7 @@
withval=$with_acl_support; case "$withval" in
yes|no)
with_acl_support="$withval"
-@@ -78276,105 +32408,85 @@
+@@ -78284,105 +32416,85 @@
with_acl_support="auto"
fi
@@ -84051,7 +84042,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78392,60 +32504,31 @@
+@@ -78400,60 +32512,31 @@
return 0;
}
_ACEOF
@@ -84121,7 +84112,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78463,61 +32546,32 @@
+@@ -78471,61 +32554,32 @@
return 0;
}
_ACEOF
@@ -84192,7 +84183,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -78536,64 +32590,33 @@
+@@ -78544,64 +32598,33 @@
return 0;
}
_ACEOF
@@ -84267,7 +84258,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -78611,58 +32634,29 @@
+@@ -78619,58 +32642,29 @@
return 0;
}
_ACEOF
@@ -84334,7 +84325,7 @@
fi
;;
-@@ -78674,31 +32668,27 @@
+@@ -78682,31 +32676,27 @@
#################################################
# check for AIO support
@@ -84372,7 +84363,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78716,58 +32706,29 @@
+@@ -78724,58 +32714,29 @@
return 0;
}
_ACEOF
@@ -84440,7 +84431,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78785,59 +32746,30 @@
+@@ -78793,59 +32754,30 @@
return 0;
}
_ACEOF
@@ -84509,7 +84500,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -78849,55 +32781,26 @@
+@@ -78857,55 +32789,26 @@
return 0;
}
_ACEOF
@@ -84573,7 +84564,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -78909,716 +32812,317 @@
+@@ -78917,716 +32820,317 @@
return 0;
}
_ACEOF
@@ -85428,7 +85419,7 @@
$as_echo "no" >&6; }
fi
-@@ -79635,30 +33139,26 @@
+@@ -79643,30 +33147,26 @@
# check for sendfile support
with_sendfile_support=yes
@@ -85465,7 +85456,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -79674,53 +33174,24 @@
+@@ -79682,53 +33182,24 @@
return 0;
}
_ACEOF
@@ -85527,7 +85518,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -79736,54 +33207,25 @@
+@@ -79744,54 +33215,25 @@
return 0;
}
_ACEOF
@@ -85590,7 +85581,7 @@
/* end confdefs.h. */
\
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -79803,103 +33245,58 @@
+@@ -79811,103 +33253,58 @@
return 0;
}
_ACEOF
@@ -85711,7 +85702,7 @@
/* end confdefs.h. */
\
#include <sys/types.h>
-@@ -79921,81 +33318,46 @@
+@@ -79929,81 +33326,46 @@
hdtrl.iov_base = NULL;
hdtrl.iov_len = 0;
ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
@@ -85810,7 +85801,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -80019,73 +33381,38 @@
+@@ -80027,73 +33389,38 @@
return 0;
}
_ACEOF
@@ -85896,7 +85887,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -80109,77 +33436,41 @@
+@@ -80117,77 +33444,41 @@
return 0;
}
_ACEOF
@@ -85986,7 +85977,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80197,43 +33488,18 @@
+@@ -80205,43 +33496,18 @@
return 0;
}
_ACEOF
@@ -86036,7 +86027,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSENDFILE 1
_ACEOF
-@@ -80242,17 +33508,13 @@
+@@ -80250,17 +33516,13 @@
fi
@@ -86057,7 +86048,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -80283,74 +33545,39 @@
+@@ -80291,74 +33553,39 @@
return 0;
}
_ACEOF
@@ -86144,7 +86135,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -80381,75 +33608,40 @@
+@@ -80389,75 +33616,40 @@
return 0;
}
_ACEOF
@@ -86232,7 +86223,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -80477,59 +33669,28 @@
+@@ -80485,59 +33677,28 @@
return 0;
}
_ACEOF
@@ -86301,7 +86292,7 @@
$as_echo "no" >&6; };
fi
;;
-@@ -80538,12 +33699,12 @@
+@@ -80546,12 +33707,12 @@
esac
;;
*)
@@ -86316,7 +86307,7 @@
$as_echo "yes" >&6; }
fi
-@@ -80552,17 +33713,13 @@
+@@ -80560,17 +33721,13 @@
############################################
# See if we have the Linux readahead syscall.
@@ -86337,7 +86328,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -80577,62 +33734,31 @@
+@@ -80585,62 +33742,31 @@
return 0;
}
_ACEOF
@@ -86409,7 +86400,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -80643,41 +33769,18 @@
+@@ -80651,41 +33777,18 @@
return 0;
}
_ACEOF
@@ -86455,7 +86446,7 @@
fi
-@@ -80685,17 +33788,13 @@
+@@ -80693,17 +33796,13 @@
############################################
# See if we have the posix_fadvise syscall.
@@ -86476,7 +86467,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -80710,47 +33809,20 @@
+@@ -80718,47 +33817,20 @@
return 0;
}
_ACEOF
@@ -86530,7 +86521,7 @@
fi
-@@ -80759,17 +33831,13 @@
+@@ -80767,17 +33839,13 @@
case "$host_os" in
*linux*)
@@ -86551,7 +86542,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -80784,40 +33852,15 @@
+@@ -80792,40 +33860,15 @@
return 0;
}
_ACEOF
@@ -86597,7 +86588,7 @@
$as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
;;
*)
-@@ -80827,24 +33870,18 @@
+@@ -80835,24 +33878,18 @@
if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
@@ -86626,7 +86617,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -80855,41 +33892,18 @@
+@@ -80863,41 +33900,18 @@
return 0;
}
_ACEOF
@@ -86672,7 +86663,7 @@
fi
-@@ -80897,68 +33911,35 @@
+@@ -80905,68 +33919,35 @@
############################################
# See if we have the a broken readlink syscall.
@@ -86751,7 +86742,7 @@
fi
-@@ -80966,7 +33947,7 @@
+@@ -80974,7 +33955,7 @@
# Check whether winbind is supported on this platform. If so we need to
# build and install client programs, sbin programs and shared libraries
@@ -86760,7 +86751,7 @@
$as_echo_n "checking whether to build winbind... " >&6; }
# Initially, the value of $host_os decides whether winbind is supported
-@@ -80978,7 +33959,7 @@
+@@ -80986,7 +33967,7 @@
# We define this here so --with-winbind can override it.
# Check whether --with-wbclient was given.
@@ -86769,7 +86760,7 @@
withval=$with_wbclient;
case "$withval" in
no)
-@@ -81077,7 +34058,7 @@
+@@ -81085,7 +34066,7 @@
# Check whether --with-winbind was given.
@@ -86778,7 +86769,7 @@
withval=$with_winbind;
case "$withval" in
yes)
-@@ -81108,18 +34089,14 @@
+@@ -81116,18 +34097,14 @@
WINBIND_WINS_NSS=""
fi
if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -86800,7 +86791,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -81137,57 +34114,28 @@
+@@ -81145,57 +34122,28 @@
return 0;
}
_ACEOF
@@ -86867,7 +86858,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
else
-@@ -81216,12 +34164,10 @@
+@@ -81224,12 +34172,10 @@
fi
if test x"$HAVE_WINBIND" = x"yes"; then
@@ -86882,7 +86873,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -81232,22 +34178,18 @@
+@@ -81240,22 +34186,18 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
else
@@ -86909,7 +86900,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -81265,48 +34207,21 @@
+@@ -81273,48 +34215,21 @@
return 0;
}
_ACEOF
@@ -86965,7 +86956,7 @@
samba_cv_HAVE_PTHREAD=yes
else
-@@ -81324,108 +34239,11 @@
+@@ -81332,108 +34247,11 @@
# Solaris 10 does have new member in nss_XbyY_key
@@ -87078,7 +87069,7 @@
fi
-@@ -81433,318 +34251,29 @@
+@@ -81441,318 +34259,29 @@
# Solaris has some extra fields in struct passwd that need to be
# initialised otherwise nscd crashes.
@@ -87408,7 +87399,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-@@ -81753,104 +34282,9 @@
+@@ -81761,104 +34290,9 @@
fi
@@ -87516,7 +87507,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -81860,17 +34294,13 @@
+@@ -81868,17 +34302,13 @@
fi
@@ -87537,7 +87528,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
-@@ -81885,41 +34315,18 @@
+@@ -81893,41 +34323,18 @@
return 0;
}
_ACEOF
@@ -87583,7 +87574,7 @@
fi
-@@ -81929,7 +34336,7 @@
+@@ -81937,7 +34344,7 @@
# Check whether --with-included-popt was given.
@@ -87592,7 +87583,7 @@
withval=$with_included_popt;
case "$withval" in
yes)
-@@ -81942,18 +34349,14 @@
+@@ -81950,18 +34357,14 @@
fi
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -87614,7 +87605,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -81971,43 +34374,18 @@
+@@ -81979,43 +34382,18 @@
return 0;
}
_ACEOF
@@ -87664,7 +87655,7 @@
INCLUDED_POPT=no
else
INCLUDED_POPT=yes
-@@ -82015,16 +34393,16 @@
+@@ -82023,16 +34401,16 @@
fi
@@ -87684,7 +87675,7 @@
$as_echo "no" >&6; }
BUILD_POPT=""
POPTLIBS="-lpopt"
-@@ -82037,7 +34415,7 @@
+@@ -82045,7 +34423,7 @@
# Check if user wants DNS service discovery support
# Check whether --enable-dnssd was given.
@@ -87693,7 +87684,7 @@
enableval=$enable_dnssd;
fi
-@@ -82046,151 +34424,12 @@
+@@ -82054,151 +34432,12 @@
if test x"$enable_dnssd" = x"yes"; then
have_dnssd_support=yes
@@ -87850,7 +87841,7 @@
_ACEOF
fi
-@@ -82203,102 +34442,12 @@
+@@ -82211,102 +34450,12 @@
# On Darwin the DNSSD API is in libc, but on other platforms it's
# probably in -ldns_sd
@@ -87958,7 +87949,7 @@
_ACEOF
fi
-@@ -82306,23 +34455,17 @@
+@@ -82314,23 +34463,17 @@
@@ -87985,7 +87976,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -82340,54 +34483,28 @@
+@@ -82348,54 +34491,28 @@
return 0;
}
_ACEOF
@@ -88047,7 +88038,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNS_SD 1
_ACEOF
-@@ -82402,7 +34519,6 @@
+@@ -82410,7 +34527,6 @@
fi
@@ -88055,7 +88046,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
-@@ -82410,15 +34526,11 @@
+@@ -82418,15 +34534,11 @@
if test x"$have_dnssd_support" = x"yes"; then
@@ -88073,7 +88064,7 @@
fi
fi
-@@ -82428,7 +34540,7 @@
+@@ -82436,7 +34548,7 @@
# Check if user wants avahi support
# Check whether --enable-avahi was given.
@@ -88082,7 +88073,7 @@
enableval=$enable_avahi;
fi
-@@ -82436,151 +34548,12 @@
+@@ -82444,151 +34556,12 @@
if test x"$enable_avahi" != x"no"; then
have_avahi_support=yes
@@ -88239,7 +88230,7 @@
_ACEOF
fi
-@@ -82591,151 +34564,12 @@
+@@ -82599,151 +34572,12 @@
have_avahi_support=no
fi
@@ -88396,7 +88387,7 @@
_ACEOF
fi
-@@ -82747,18 +34581,14 @@
+@@ -82755,18 +34589,14 @@
fi
save_LIBS="$LIBS"
@@ -88418,7 +88409,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -82776,58 +34606,29 @@
+@@ -82784,58 +34614,29 @@
return 0;
}
_ACEOF
@@ -88486,7 +88477,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -82845,43 +34646,18 @@
+@@ -82853,43 +34654,18 @@
return 0;
}
_ACEOF
@@ -88536,7 +88527,7 @@
have_avahi_strerror=yes
fi
-@@ -82896,17 +34672,13 @@
+@@ -82904,17 +34680,13 @@
AVAHI_LIBS="-lavahi-client -lavahi-common"
@@ -88556,7 +88547,7 @@
fi
fi
fi
-@@ -82915,17 +34687,13 @@
+@@ -82923,17 +34695,13 @@
# Check if user wants pthreadpool support
# Check whether --enable-pthreadpool was given.
@@ -88576,7 +88567,7 @@
/* end confdefs.h. */
#include "pthread.h"
int
-@@ -82936,42 +34704,15 @@
+@@ -82944,42 +34712,15 @@
return 0;
}
_ACEOF
@@ -88625,7 +88616,7 @@
PTHREADPOOL_OBJ="lib/pthreadpool.o"
-@@ -82982,7 +34723,7 @@
+@@ -82990,7 +34731,7 @@
# Check whether --with-included-iniparser was given.
@@ -88634,7 +88625,7 @@
withval=$with_included_iniparser;
case "$withval" in
yes)
-@@ -82995,18 +34736,14 @@
+@@ -83003,18 +34744,14 @@
fi
if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -88656,7 +88647,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -83024,43 +34761,18 @@
+@@ -83032,43 +34769,18 @@
return 0;
}
_ACEOF
@@ -88706,7 +88697,7 @@
INCLUDED_INIPARSER=no
else
INCLUDED_INIPARSER=yes
-@@ -83068,260 +34780,40 @@
+@@ -83076,260 +34788,40 @@
fi
@@ -88993,7 +88984,7 @@
_ACEOF
fi
-@@ -83329,20 +34821,16 @@
+@@ -83337,20 +34829,16 @@
done
@@ -89018,7 +89009,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -83354,46 +34842,19 @@
+@@ -83362,46 +34850,19 @@
return statfs (".", &fsd);
}
_ACEOF
@@ -89070,7 +89061,7 @@
$as_echo "$vfsfileid_cv_statfs" >&6; }
if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -83428,7 +34889,7 @@
+@@ -83436,7 +34897,7 @@
# Check whether --with-static-modules was given.
@@ -89079,7 +89070,7 @@
withval=$with_static_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -83440,7 +34901,7 @@
+@@ -83448,7 +34909,7 @@
# Check whether --with-shared-modules was given.
@@ -89088,7 +89079,7 @@
withval=$with_shared_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -83457,7 +34918,7 @@
+@@ -83465,7 +34926,7 @@
fi
@@ -89097,7 +89088,7 @@
$as_echo_n "checking how to build pdb_ldap... " >&6; }
if test "$MODULE_pdb_ldap"; then
DEST=$MODULE_pdb_ldap
-@@ -83469,12 +34930,10 @@
+@@ -83477,12 +34938,10 @@
if test x"$DEST" = xSHARED; then
@@ -89112,7 +89103,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -83485,16 +34944,16 @@
+@@ -83493,16 +34952,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -89132,7 +89123,7 @@
$as_echo_n "checking how to build pdb_ads... " >&6; }
if test "$MODULE_pdb_ads"; then
DEST=$MODULE_pdb_ads
-@@ -83506,12 +34965,10 @@
+@@ -83514,12 +34973,10 @@
if test x"$DEST" = xSHARED; then
@@ -89147,7 +89138,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ads"
-@@ -83522,16 +34979,16 @@
+@@ -83530,16 +34987,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
@@ -89167,7 +89158,7 @@
$as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
if test "$MODULE_pdb_smbpasswd"; then
DEST=$MODULE_pdb_smbpasswd
-@@ -83543,12 +35000,10 @@
+@@ -83551,12 +35008,10 @@
if test x"$DEST" = xSHARED; then
@@ -89182,7 +89173,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -83559,16 +35014,16 @@
+@@ -83567,16 +35022,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
@@ -89202,7 +89193,7 @@
$as_echo_n "checking how to build pdb_tdbsam... " >&6; }
if test "$MODULE_pdb_tdbsam"; then
DEST=$MODULE_pdb_tdbsam
-@@ -83580,12 +35035,10 @@
+@@ -83588,12 +35043,10 @@
if test x"$DEST" = xSHARED; then
@@ -89217,7 +89208,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -83596,16 +35049,16 @@
+@@ -83604,16 +35057,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
@@ -89237,7 +89228,7 @@
$as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
if test "$MODULE_pdb_wbc_sam"; then
DEST=$MODULE_pdb_wbc_sam
-@@ -83617,12 +35070,10 @@
+@@ -83625,12 +35078,10 @@
if test x"$DEST" = xSHARED; then
@@ -89252,7 +89243,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -83633,11 +35084,11 @@
+@@ -83641,11 +35092,11 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
@@ -89266,7 +89257,7 @@
$as_echo "not" >&6; }
fi
-@@ -83659,7 +35110,7 @@
+@@ -83667,7 +35118,7 @@
@@ -89275,7 +89266,7 @@
$as_echo_n "checking how to build rpc_lsarpc... " >&6; }
if test "$MODULE_rpc_lsarpc"; then
DEST=$MODULE_rpc_lsarpc
-@@ -83671,12 +35122,10 @@
+@@ -83679,12 +35130,10 @@
if test x"$DEST" = xSHARED; then
@@ -89290,7 +89281,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -83687,16 +35136,16 @@
+@@ -83695,16 +35144,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
@@ -89310,7 +89301,7 @@
$as_echo_n "checking how to build rpc_winreg... " >&6; }
if test "$MODULE_rpc_winreg"; then
DEST=$MODULE_rpc_winreg
-@@ -83708,12 +35157,10 @@
+@@ -83716,12 +35165,10 @@
if test x"$DEST" = xSHARED; then
@@ -89325,7 +89316,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -83724,16 +35171,16 @@
+@@ -83732,16 +35179,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
@@ -89345,7 +89336,7 @@
$as_echo_n "checking how to build rpc_initshutdown... " >&6; }
if test "$MODULE_rpc_initshutdown"; then
DEST=$MODULE_rpc_initshutdown
-@@ -83745,12 +35192,10 @@
+@@ -83753,12 +35200,10 @@
if test x"$DEST" = xSHARED; then
@@ -89360,7 +89351,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -83761,16 +35206,16 @@
+@@ -83769,16 +35214,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
@@ -89380,7 +89371,7 @@
$as_echo_n "checking how to build rpc_dssetup... " >&6; }
if test "$MODULE_rpc_dssetup"; then
DEST=$MODULE_rpc_dssetup
-@@ -83782,12 +35227,10 @@
+@@ -83790,12 +35235,10 @@
if test x"$DEST" = xSHARED; then
@@ -89395,7 +89386,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -83798,16 +35241,16 @@
+@@ -83806,16 +35249,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
@@ -89415,7 +89406,7 @@
$as_echo_n "checking how to build rpc_wkssvc... " >&6; }
if test "$MODULE_rpc_wkssvc"; then
DEST=$MODULE_rpc_wkssvc
-@@ -83819,12 +35262,10 @@
+@@ -83827,12 +35270,10 @@
if test x"$DEST" = xSHARED; then
@@ -89430,7 +89421,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -83835,16 +35276,16 @@
+@@ -83843,16 +35284,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
@@ -89450,7 +89441,7 @@
$as_echo_n "checking how to build rpc_svcctl... " >&6; }
if test "$MODULE_rpc_svcctl"; then
DEST=$MODULE_rpc_svcctl
-@@ -83856,12 +35297,10 @@
+@@ -83864,12 +35305,10 @@
if test x"$DEST" = xSHARED; then
@@ -89465,7 +89456,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -83872,16 +35311,16 @@
+@@ -83880,16 +35319,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
@@ -89485,7 +89476,7 @@
$as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
if test "$MODULE_rpc_ntsvcs"; then
DEST=$MODULE_rpc_ntsvcs
-@@ -83893,12 +35332,10 @@
+@@ -83901,12 +35340,10 @@
if test x"$DEST" = xSHARED; then
@@ -89500,7 +89491,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -83909,16 +35346,16 @@
+@@ -83917,16 +35354,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
@@ -89520,7 +89511,7 @@
$as_echo_n "checking how to build rpc_netlogon... " >&6; }
if test "$MODULE_rpc_netlogon"; then
DEST=$MODULE_rpc_netlogon
-@@ -83930,12 +35367,10 @@
+@@ -83938,12 +35375,10 @@
if test x"$DEST" = xSHARED; then
@@ -89535,7 +89526,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -83946,16 +35381,16 @@
+@@ -83954,16 +35389,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
@@ -89555,7 +89546,7 @@
$as_echo_n "checking how to build rpc_netdfs... " >&6; }
if test "$MODULE_rpc_netdfs"; then
DEST=$MODULE_rpc_netdfs
-@@ -83967,12 +35402,10 @@
+@@ -83975,12 +35410,10 @@
if test x"$DEST" = xSHARED; then
@@ -89570,7 +89561,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -83983,16 +35416,16 @@
+@@ -83991,16 +35424,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
@@ -89590,7 +89581,7 @@
$as_echo_n "checking how to build rpc_srvsvc... " >&6; }
if test "$MODULE_rpc_srvsvc"; then
DEST=$MODULE_rpc_srvsvc
-@@ -84004,12 +35437,10 @@
+@@ -84012,12 +35445,10 @@
if test x"$DEST" = xSHARED; then
@@ -89605,7 +89596,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -84020,16 +35451,16 @@
+@@ -84028,16 +35459,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
@@ -89625,7 +89616,7 @@
$as_echo_n "checking how to build rpc_spoolss... " >&6; }
if test "$MODULE_rpc_spoolss"; then
DEST=$MODULE_rpc_spoolss
-@@ -84041,12 +35472,10 @@
+@@ -84049,12 +35480,10 @@
if test x"$DEST" = xSHARED; then
@@ -89640,7 +89631,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -84057,16 +35486,16 @@
+@@ -84065,16 +35494,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
@@ -89660,7 +89651,7 @@
$as_echo_n "checking how to build rpc_eventlog... " >&6; }
if test "$MODULE_rpc_eventlog"; then
DEST=$MODULE_rpc_eventlog
-@@ -84078,12 +35507,10 @@
+@@ -84086,12 +35515,10 @@
if test x"$DEST" = xSHARED; then
@@ -89675,7 +89666,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -84094,16 +35521,16 @@
+@@ -84102,16 +35529,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
@@ -89695,7 +89686,7 @@
$as_echo_n "checking how to build rpc_samr... " >&6; }
if test "$MODULE_rpc_samr"; then
DEST=$MODULE_rpc_samr
-@@ -84115,12 +35542,10 @@
+@@ -84123,12 +35550,10 @@
if test x"$DEST" = xSHARED; then
@@ -89710,7 +89701,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_samr"
-@@ -84131,16 +35556,16 @@
+@@ -84139,16 +35564,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
@@ -89730,7 +89721,7 @@
$as_echo_n "checking how to build rpc_rpcecho... " >&6; }
if test "$MODULE_rpc_rpcecho"; then
DEST=$MODULE_rpc_rpcecho
-@@ -84152,12 +35577,10 @@
+@@ -84160,12 +35585,10 @@
if test x"$DEST" = xSHARED; then
@@ -89745,7 +89736,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -84168,11 +35591,11 @@
+@@ -84176,11 +35599,11 @@
RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
@@ -89759,7 +89750,7 @@
$as_echo "not" >&6; }
fi
-@@ -84193,7 +35616,7 @@
+@@ -84201,7 +35624,7 @@
@@ -89768,7 +89759,7 @@
$as_echo_n "checking how to build idmap_ldap... " >&6; }
if test "$MODULE_idmap_ldap"; then
DEST=$MODULE_idmap_ldap
-@@ -84205,12 +35628,10 @@
+@@ -84213,12 +35636,10 @@
if test x"$DEST" = xSHARED; then
@@ -89783,7 +89774,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -84221,16 +35642,16 @@
+@@ -84229,16 +35650,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
@@ -89803,7 +89794,7 @@
$as_echo_n "checking how to build idmap_tdb... " >&6; }
if test "$MODULE_idmap_tdb"; then
DEST=$MODULE_idmap_tdb
-@@ -84242,12 +35663,10 @@
+@@ -84250,12 +35671,10 @@
if test x"$DEST" = xSHARED; then
@@ -89818,7 +89809,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -84258,16 +35677,16 @@
+@@ -84266,16 +35685,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
@@ -89838,7 +89829,7 @@
$as_echo_n "checking how to build idmap_tdb2... " >&6; }
if test "$MODULE_idmap_tdb2"; then
DEST=$MODULE_idmap_tdb2
-@@ -84279,12 +35698,10 @@
+@@ -84287,12 +35706,10 @@
if test x"$DEST" = xSHARED; then
@@ -89853,7 +89844,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -84295,16 +35712,16 @@
+@@ -84303,16 +35720,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
@@ -89873,7 +89864,7 @@
$as_echo_n "checking how to build idmap_passdb... " >&6; }
if test "$MODULE_idmap_passdb"; then
DEST=$MODULE_idmap_passdb
-@@ -84316,12 +35733,10 @@
+@@ -84324,12 +35741,10 @@
if test x"$DEST" = xSHARED; then
@@ -89888,7 +89879,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -84332,16 +35747,16 @@
+@@ -84340,16 +35755,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
@@ -89908,7 +89899,7 @@
$as_echo_n "checking how to build idmap_nss... " >&6; }
if test "$MODULE_idmap_nss"; then
DEST=$MODULE_idmap_nss
-@@ -84353,12 +35768,10 @@
+@@ -84361,12 +35776,10 @@
if test x"$DEST" = xSHARED; then
@@ -89923,7 +89914,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_nss"
-@@ -84369,16 +35782,16 @@
+@@ -84377,16 +35790,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
@@ -89943,7 +89934,7 @@
$as_echo_n "checking how to build idmap_rid... " >&6; }
if test "$MODULE_idmap_rid"; then
DEST=$MODULE_idmap_rid
-@@ -84390,12 +35803,10 @@
+@@ -84398,12 +35811,10 @@
if test x"$DEST" = xSHARED; then
@@ -89958,7 +89949,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_rid"
-@@ -84406,16 +35817,16 @@
+@@ -84414,16 +35825,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
@@ -89978,7 +89969,7 @@
$as_echo_n "checking how to build idmap_ad... " >&6; }
if test "$MODULE_idmap_ad"; then
DEST=$MODULE_idmap_ad
-@@ -84427,12 +35838,10 @@
+@@ -84435,12 +35846,10 @@
if test x"$DEST" = xSHARED; then
@@ -89993,7 +89984,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ad"
-@@ -84443,16 +35852,16 @@
+@@ -84451,16 +35860,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
@@ -90013,7 +90004,7 @@
$as_echo_n "checking how to build idmap_hash... " >&6; }
if test "$MODULE_idmap_hash"; then
DEST=$MODULE_idmap_hash
-@@ -84464,12 +35873,10 @@
+@@ -84472,12 +35881,10 @@
if test x"$DEST" = xSHARED; then
@@ -90028,7 +90019,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_hash"
-@@ -84480,16 +35887,16 @@
+@@ -84488,16 +35895,16 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
@@ -90048,7 +90039,7 @@
$as_echo_n "checking how to build idmap_adex... " >&6; }
if test "$MODULE_idmap_adex"; then
DEST=$MODULE_idmap_adex
-@@ -84501,12 +35908,10 @@
+@@ -84509,12 +35916,10 @@
if test x"$DEST" = xSHARED; then
@@ -90063,7 +90054,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_adex"
-@@ -84517,11 +35922,11 @@
+@@ -84525,11 +35930,11 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
@@ -90077,7 +90068,7 @@
$as_echo "not" >&6; }
fi
-@@ -84542,7 +35947,7 @@
+@@ -84550,7 +35955,7 @@
@@ -90086,7 +90077,7 @@
$as_echo_n "checking how to build nss_info_template... " >&6; }
if test "$MODULE_nss_info_template"; then
DEST=$MODULE_nss_info_template
-@@ -84554,12 +35959,10 @@
+@@ -84562,12 +35967,10 @@
if test x"$DEST" = xSHARED; then
@@ -90101,7 +90092,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules nss_info_template"
-@@ -84570,11 +35973,11 @@
+@@ -84578,11 +35981,11 @@
NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
@@ -90115,7 +90106,7 @@
$as_echo "not" >&6; }
fi
-@@ -84595,7 +35998,7 @@
+@@ -84603,7 +36006,7 @@
@@ -90124,7 +90115,7 @@
$as_echo_n "checking how to build charset_weird... " >&6; }
if test "$MODULE_charset_weird"; then
DEST=$MODULE_charset_weird
-@@ -84607,12 +36010,10 @@
+@@ -84615,12 +36018,10 @@
if test x"$DEST" = xSHARED; then
@@ -90139,7 +90130,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_weird"
-@@ -84623,16 +36024,16 @@
+@@ -84631,16 +36032,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
@@ -90159,7 +90150,7 @@
$as_echo_n "checking how to build charset_CP850... " >&6; }
if test "$MODULE_charset_CP850"; then
DEST=$MODULE_charset_CP850
-@@ -84644,12 +36045,10 @@
+@@ -84652,12 +36053,10 @@
if test x"$DEST" = xSHARED; then
@@ -90174,7 +90165,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP850"
-@@ -84660,16 +36059,16 @@
+@@ -84668,16 +36067,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
@@ -90194,7 +90185,7 @@
$as_echo_n "checking how to build charset_CP437... " >&6; }
if test "$MODULE_charset_CP437"; then
DEST=$MODULE_charset_CP437
-@@ -84681,12 +36080,10 @@
+@@ -84689,12 +36088,10 @@
if test x"$DEST" = xSHARED; then
@@ -90209,7 +90200,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP437"
-@@ -84697,16 +36094,16 @@
+@@ -84705,16 +36102,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
@@ -90229,7 +90220,7 @@
$as_echo_n "checking how to build charset_macosxfs... " >&6; }
if test "$MODULE_charset_macosxfs"; then
DEST=$MODULE_charset_macosxfs
-@@ -84718,12 +36115,10 @@
+@@ -84726,12 +36123,10 @@
if test x"$DEST" = xSHARED; then
@@ -90244,7 +90235,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -84734,11 +36129,11 @@
+@@ -84742,11 +36137,11 @@
CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
@@ -90258,7 +90249,7 @@
$as_echo "not" >&6; }
fi
-@@ -84759,7 +36154,7 @@
+@@ -84767,7 +36162,7 @@
@@ -90267,7 +90258,7 @@
$as_echo_n "checking how to build auth_sam... " >&6; }
if test "$MODULE_auth_sam"; then
DEST=$MODULE_auth_sam
-@@ -84771,12 +36166,10 @@
+@@ -84779,12 +36174,10 @@
if test x"$DEST" = xSHARED; then
@@ -90282,7 +90273,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_sam"
-@@ -84787,16 +36180,16 @@
+@@ -84795,16 +36188,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
@@ -90302,7 +90293,7 @@
$as_echo_n "checking how to build auth_unix... " >&6; }
if test "$MODULE_auth_unix"; then
DEST=$MODULE_auth_unix
-@@ -84808,12 +36201,10 @@
+@@ -84816,12 +36209,10 @@
if test x"$DEST" = xSHARED; then
@@ -90317,7 +90308,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_unix"
-@@ -84824,16 +36215,16 @@
+@@ -84832,16 +36223,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
@@ -90337,7 +90328,7 @@
$as_echo_n "checking how to build auth_winbind... " >&6; }
if test "$MODULE_auth_winbind"; then
DEST=$MODULE_auth_winbind
-@@ -84845,12 +36236,10 @@
+@@ -84853,12 +36244,10 @@
if test x"$DEST" = xSHARED; then
@@ -90352,7 +90343,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_winbind"
-@@ -84861,16 +36250,16 @@
+@@ -84869,16 +36258,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
@@ -90372,7 +90363,7 @@
$as_echo_n "checking how to build auth_wbc... " >&6; }
if test "$MODULE_auth_wbc"; then
DEST=$MODULE_auth_wbc
-@@ -84882,12 +36271,10 @@
+@@ -84890,12 +36279,10 @@
if test x"$DEST" = xSHARED; then
@@ -90387,7 +90378,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_wbc"
-@@ -84898,16 +36285,16 @@
+@@ -84906,16 +36293,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
@@ -90407,7 +90398,7 @@
$as_echo_n "checking how to build auth_server... " >&6; }
if test "$MODULE_auth_server"; then
DEST=$MODULE_auth_server
-@@ -84919,12 +36306,10 @@
+@@ -84927,12 +36314,10 @@
if test x"$DEST" = xSHARED; then
@@ -90422,7 +90413,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_server"
-@@ -84935,16 +36320,16 @@
+@@ -84943,16 +36328,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
@@ -90442,7 +90433,7 @@
$as_echo_n "checking how to build auth_domain... " >&6; }
if test "$MODULE_auth_domain"; then
DEST=$MODULE_auth_domain
-@@ -84956,12 +36341,10 @@
+@@ -84964,12 +36349,10 @@
if test x"$DEST" = xSHARED; then
@@ -90457,7 +90448,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_domain"
-@@ -84972,16 +36355,16 @@
+@@ -84980,16 +36363,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
@@ -90477,7 +90468,7 @@
$as_echo_n "checking how to build auth_builtin... " >&6; }
if test "$MODULE_auth_builtin"; then
DEST=$MODULE_auth_builtin
-@@ -84993,12 +36376,10 @@
+@@ -85001,12 +36384,10 @@
if test x"$DEST" = xSHARED; then
@@ -90492,7 +90483,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_builtin"
-@@ -85009,16 +36390,16 @@
+@@ -85017,16 +36398,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
@@ -90512,7 +90503,7 @@
$as_echo_n "checking how to build auth_script... " >&6; }
if test "$MODULE_auth_script"; then
DEST=$MODULE_auth_script
-@@ -85030,12 +36411,10 @@
+@@ -85038,12 +36419,10 @@
if test x"$DEST" = xSHARED; then
@@ -90527,7 +90518,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_script"
-@@ -85046,16 +36425,16 @@
+@@ -85054,16 +36433,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
@@ -90547,7 +90538,7 @@
$as_echo_n "checking how to build auth_netlogond... " >&6; }
if test "$MODULE_auth_netlogond"; then
DEST=$MODULE_auth_netlogond
-@@ -85067,12 +36446,10 @@
+@@ -85075,12 +36454,10 @@
if test x"$DEST" = xSHARED; then
@@ -90562,7 +90553,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -85083,11 +36460,11 @@
+@@ -85091,11 +36468,11 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
@@ -90576,7 +90567,7 @@
$as_echo "not" >&6; }
fi
-@@ -85108,7 +36485,7 @@
+@@ -85116,7 +36493,7 @@
@@ -90585,7 +90576,7 @@
$as_echo_n "checking how to build vfs_default... " >&6; }
if test "$MODULE_vfs_default"; then
DEST=$MODULE_vfs_default
-@@ -85120,12 +36497,10 @@
+@@ -85128,12 +36505,10 @@
if test x"$DEST" = xSHARED; then
@@ -90600,7 +90591,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default"
-@@ -85136,16 +36511,16 @@
+@@ -85144,16 +36519,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
@@ -90620,7 +90611,7 @@
$as_echo_n "checking how to build vfs_recycle... " >&6; }
if test "$MODULE_vfs_recycle"; then
DEST=$MODULE_vfs_recycle
-@@ -85157,12 +36532,10 @@
+@@ -85165,12 +36540,10 @@
if test x"$DEST" = xSHARED; then
@@ -90635,7 +90626,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -85173,16 +36546,16 @@
+@@ -85181,16 +36554,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
@@ -90655,7 +90646,7 @@
$as_echo_n "checking how to build vfs_audit... " >&6; }
if test "$MODULE_vfs_audit"; then
DEST=$MODULE_vfs_audit
-@@ -85194,12 +36567,10 @@
+@@ -85202,12 +36575,10 @@
if test x"$DEST" = xSHARED; then
@@ -90670,7 +90661,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_audit"
-@@ -85210,16 +36581,16 @@
+@@ -85218,16 +36589,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
@@ -90690,7 +90681,7 @@
$as_echo_n "checking how to build vfs_extd_audit... " >&6; }
if test "$MODULE_vfs_extd_audit"; then
DEST=$MODULE_vfs_extd_audit
-@@ -85231,12 +36602,10 @@
+@@ -85239,12 +36610,10 @@
if test x"$DEST" = xSHARED; then
@@ -90705,7 +90696,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -85247,16 +36616,16 @@
+@@ -85255,16 +36624,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
@@ -90725,7 +90716,7 @@
$as_echo_n "checking how to build vfs_full_audit... " >&6; }
if test "$MODULE_vfs_full_audit"; then
DEST=$MODULE_vfs_full_audit
-@@ -85268,12 +36637,10 @@
+@@ -85276,12 +36645,10 @@
if test x"$DEST" = xSHARED; then
@@ -90740,7 +90731,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -85284,16 +36651,16 @@
+@@ -85292,16 +36659,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
@@ -90760,7 +90751,7 @@
$as_echo_n "checking how to build vfs_netatalk... " >&6; }
if test "$MODULE_vfs_netatalk"; then
DEST=$MODULE_vfs_netatalk
-@@ -85305,12 +36672,10 @@
+@@ -85313,12 +36680,10 @@
if test x"$DEST" = xSHARED; then
@@ -90775,7 +90766,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -85321,16 +36686,16 @@
+@@ -85329,16 +36694,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
@@ -90795,7 +90786,7 @@
$as_echo_n "checking how to build vfs_fake_perms... " >&6; }
if test "$MODULE_vfs_fake_perms"; then
DEST=$MODULE_vfs_fake_perms
-@@ -85342,12 +36707,10 @@
+@@ -85350,12 +36715,10 @@
if test x"$DEST" = xSHARED; then
@@ -90810,7 +90801,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -85358,16 +36721,16 @@
+@@ -85366,16 +36729,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
@@ -90830,7 +90821,7 @@
$as_echo_n "checking how to build vfs_default_quota... " >&6; }
if test "$MODULE_vfs_default_quota"; then
DEST=$MODULE_vfs_default_quota
-@@ -85379,12 +36742,10 @@
+@@ -85387,12 +36750,10 @@
if test x"$DEST" = xSHARED; then
@@ -90845,7 +90836,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -85395,16 +36756,16 @@
+@@ -85403,16 +36764,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
@@ -90865,7 +90856,7 @@
$as_echo_n "checking how to build vfs_readonly... " >&6; }
if test "$MODULE_vfs_readonly"; then
DEST=$MODULE_vfs_readonly
-@@ -85416,12 +36777,10 @@
+@@ -85424,12 +36785,10 @@
if test x"$DEST" = xSHARED; then
@@ -90880,7 +90871,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -85432,16 +36791,16 @@
+@@ -85440,16 +36799,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
@@ -90900,7 +90891,7 @@
$as_echo_n "checking how to build vfs_cap... " >&6; }
if test "$MODULE_vfs_cap"; then
DEST=$MODULE_vfs_cap
-@@ -85453,12 +36812,10 @@
+@@ -85461,12 +36820,10 @@
if test x"$DEST" = xSHARED; then
@@ -90915,7 +90906,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cap"
-@@ -85469,16 +36826,16 @@
+@@ -85477,16 +36834,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
@@ -90935,7 +90926,7 @@
$as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
if test "$MODULE_vfs_expand_msdfs"; then
DEST=$MODULE_vfs_expand_msdfs
-@@ -85490,12 +36847,10 @@
+@@ -85498,12 +36855,10 @@
if test x"$DEST" = xSHARED; then
@@ -90950,7 +90941,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -85506,16 +36861,16 @@
+@@ -85514,16 +36869,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
@@ -90970,7 +90961,7 @@
$as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
if test "$MODULE_vfs_shadow_copy"; then
DEST=$MODULE_vfs_shadow_copy
-@@ -85527,12 +36882,10 @@
+@@ -85535,12 +36890,10 @@
if test x"$DEST" = xSHARED; then
@@ -90985,7 +90976,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -85543,16 +36896,16 @@
+@@ -85551,16 +36904,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
@@ -91005,7 +90996,7 @@
$as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
if test "$MODULE_vfs_shadow_copy2"; then
DEST=$MODULE_vfs_shadow_copy2
-@@ -85564,12 +36917,10 @@
+@@ -85572,12 +36925,10 @@
if test x"$DEST" = xSHARED; then
@@ -91020,7 +91011,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -85580,16 +36931,16 @@
+@@ -85588,16 +36939,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
@@ -91040,7 +91031,7 @@
$as_echo_n "checking how to build vfs_afsacl... " >&6; }
if test "$MODULE_vfs_afsacl"; then
DEST=$MODULE_vfs_afsacl
-@@ -85601,12 +36952,10 @@
+@@ -85609,12 +36960,10 @@
if test x"$DEST" = xSHARED; then
@@ -91055,7 +91046,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -85617,16 +36966,16 @@
+@@ -85625,16 +36974,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
@@ -91075,7 +91066,7 @@
$as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
if test "$MODULE_vfs_xattr_tdb"; then
DEST=$MODULE_vfs_xattr_tdb
-@@ -85638,12 +36987,10 @@
+@@ -85646,12 +36995,10 @@
if test x"$DEST" = xSHARED; then
@@ -91090,7 +91081,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -85654,16 +37001,16 @@
+@@ -85662,16 +37009,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
@@ -91110,7 +91101,7 @@
$as_echo_n "checking how to build vfs_posixacl... " >&6; }
if test "$MODULE_vfs_posixacl"; then
DEST=$MODULE_vfs_posixacl
-@@ -85675,12 +37022,10 @@
+@@ -85683,12 +37030,10 @@
if test x"$DEST" = xSHARED; then
@@ -91125,7 +91116,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -85691,16 +37036,16 @@
+@@ -85699,16 +37044,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
@@ -91145,7 +91136,7 @@
$as_echo_n "checking how to build vfs_aixacl... " >&6; }
if test "$MODULE_vfs_aixacl"; then
DEST=$MODULE_vfs_aixacl
-@@ -85712,12 +37057,10 @@
+@@ -85720,12 +37065,10 @@
if test x"$DEST" = xSHARED; then
@@ -91160,7 +91151,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -85728,16 +37071,16 @@
+@@ -85736,16 +37079,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
@@ -91180,7 +91171,7 @@
$as_echo_n "checking how to build vfs_aixacl2... " >&6; }
if test "$MODULE_vfs_aixacl2"; then
DEST=$MODULE_vfs_aixacl2
-@@ -85749,12 +37092,10 @@
+@@ -85757,12 +37100,10 @@
if test x"$DEST" = xSHARED; then
@@ -91195,7 +91186,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -85765,16 +37106,16 @@
+@@ -85773,16 +37114,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
@@ -91215,7 +91206,7 @@
$as_echo_n "checking how to build vfs_solarisacl... " >&6; }
if test "$MODULE_vfs_solarisacl"; then
DEST=$MODULE_vfs_solarisacl
-@@ -85786,12 +37127,10 @@
+@@ -85794,12 +37135,10 @@
if test x"$DEST" = xSHARED; then
@@ -91230,7 +91221,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -85802,16 +37141,16 @@
+@@ -85810,16 +37149,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
@@ -91250,7 +91241,7 @@
$as_echo_n "checking how to build vfs_irixacl... " >&6; }
if test "$MODULE_vfs_irixacl"; then
DEST=$MODULE_vfs_irixacl
-@@ -85823,12 +37162,10 @@
+@@ -85831,12 +37170,10 @@
if test x"$DEST" = xSHARED; then
@@ -91265,7 +91256,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -85839,16 +37176,16 @@
+@@ -85847,16 +37184,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
@@ -91285,7 +91276,7 @@
$as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
if test "$MODULE_vfs_hpuxacl"; then
DEST=$MODULE_vfs_hpuxacl
-@@ -85860,12 +37197,10 @@
+@@ -85868,12 +37205,10 @@
if test x"$DEST" = xSHARED; then
@@ -91300,7 +91291,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -85876,16 +37211,16 @@
+@@ -85884,16 +37219,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
@@ -91320,7 +91311,7 @@
$as_echo_n "checking how to build vfs_tru64acl... " >&6; }
if test "$MODULE_vfs_tru64acl"; then
DEST=$MODULE_vfs_tru64acl
-@@ -85897,12 +37232,10 @@
+@@ -85905,12 +37240,10 @@
if test x"$DEST" = xSHARED; then
@@ -91335,7 +91326,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -85913,16 +37246,16 @@
+@@ -85921,16 +37254,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
@@ -91355,7 +91346,7 @@
$as_echo_n "checking how to build vfs_catia... " >&6; }
if test "$MODULE_vfs_catia"; then
DEST=$MODULE_vfs_catia
-@@ -85934,12 +37267,10 @@
+@@ -85942,12 +37275,10 @@
if test x"$DEST" = xSHARED; then
@@ -91370,7 +91361,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_catia"
-@@ -85950,16 +37281,16 @@
+@@ -85958,16 +37289,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
@@ -91390,7 +91381,7 @@
$as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
if test "$MODULE_vfs_streams_xattr"; then
DEST=$MODULE_vfs_streams_xattr
-@@ -85971,12 +37302,10 @@
+@@ -85979,12 +37310,10 @@
if test x"$DEST" = xSHARED; then
@@ -91405,7 +91396,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -85987,16 +37316,16 @@
+@@ -85995,16 +37324,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
@@ -91425,7 +91416,7 @@
$as_echo_n "checking how to build vfs_streams_depot... " >&6; }
if test "$MODULE_vfs_streams_depot"; then
DEST=$MODULE_vfs_streams_depot
-@@ -86008,12 +37337,10 @@
+@@ -86016,12 +37345,10 @@
if test x"$DEST" = xSHARED; then
@@ -91440,7 +91431,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -86024,16 +37351,16 @@
+@@ -86032,16 +37359,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
@@ -91460,7 +91451,7 @@
$as_echo_n "checking how to build vfs_cacheprime... " >&6; }
if test "$MODULE_vfs_cacheprime"; then
DEST=$MODULE_vfs_cacheprime
-@@ -86045,12 +37372,10 @@
+@@ -86053,12 +37380,10 @@
if test x"$DEST" = xSHARED; then
@@ -91475,7 +91466,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -86061,16 +37386,16 @@
+@@ -86069,16 +37394,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
@@ -91495,7 +91486,7 @@
$as_echo_n "checking how to build vfs_prealloc... " >&6; }
if test "$MODULE_vfs_prealloc"; then
DEST=$MODULE_vfs_prealloc
-@@ -86082,12 +37407,10 @@
+@@ -86090,12 +37415,10 @@
if test x"$DEST" = xSHARED; then
@@ -91510,7 +91501,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -86098,16 +37421,16 @@
+@@ -86106,16 +37429,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
@@ -91530,7 +91521,7 @@
$as_echo_n "checking how to build vfs_commit... " >&6; }
if test "$MODULE_vfs_commit"; then
DEST=$MODULE_vfs_commit
-@@ -86119,12 +37442,10 @@
+@@ -86127,12 +37450,10 @@
if test x"$DEST" = xSHARED; then
@@ -91545,7 +91536,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_commit"
-@@ -86135,16 +37456,16 @@
+@@ -86143,16 +37464,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
@@ -91565,7 +91556,7 @@
$as_echo_n "checking how to build vfs_gpfs... " >&6; }
if test "$MODULE_vfs_gpfs"; then
DEST=$MODULE_vfs_gpfs
-@@ -86156,12 +37477,10 @@
+@@ -86164,12 +37485,10 @@
if test x"$DEST" = xSHARED; then
@@ -91580,7 +91571,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -86172,16 +37491,16 @@
+@@ -86180,16 +37499,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
@@ -91600,7 +91591,7 @@
$as_echo_n "checking how to build vfs_readahead... " >&6; }
if test "$MODULE_vfs_readahead"; then
DEST=$MODULE_vfs_readahead
-@@ -86193,12 +37512,10 @@
+@@ -86201,12 +37520,10 @@
if test x"$DEST" = xSHARED; then
@@ -91615,7 +91606,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -86209,16 +37526,16 @@
+@@ -86217,16 +37534,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
@@ -91635,7 +91626,7 @@
$as_echo_n "checking how to build vfs_tsmsm... " >&6; }
if test "$MODULE_vfs_tsmsm"; then
DEST=$MODULE_vfs_tsmsm
-@@ -86230,12 +37547,10 @@
+@@ -86238,12 +37555,10 @@
if test x"$DEST" = xSHARED; then
@@ -91650,7 +91641,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -86246,16 +37561,16 @@
+@@ -86254,16 +37569,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
@@ -91670,7 +91661,7 @@
$as_echo_n "checking how to build vfs_fileid... " >&6; }
if test "$MODULE_vfs_fileid"; then
DEST=$MODULE_vfs_fileid
-@@ -86267,12 +37582,10 @@
+@@ -86275,12 +37590,10 @@
if test x"$DEST" = xSHARED; then
@@ -91685,7 +91676,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -86283,16 +37596,16 @@
+@@ -86291,16 +37604,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
@@ -91705,7 +91696,7 @@
$as_echo_n "checking how to build vfs_aio_fork... " >&6; }
if test "$MODULE_vfs_aio_fork"; then
DEST=$MODULE_vfs_aio_fork
-@@ -86304,12 +37617,10 @@
+@@ -86312,12 +37625,10 @@
if test x"$DEST" = xSHARED; then
@@ -91720,7 +91711,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -86320,16 +37631,16 @@
+@@ -86328,16 +37639,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
@@ -91740,7 +91731,7 @@
$as_echo_n "checking how to build vfs_preopen... " >&6; }
if test "$MODULE_vfs_preopen"; then
DEST=$MODULE_vfs_preopen
-@@ -86341,12 +37652,10 @@
+@@ -86349,12 +37660,10 @@
if test x"$DEST" = xSHARED; then
@@ -91755,7 +91746,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -86357,16 +37666,16 @@
+@@ -86365,16 +37674,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
@@ -91775,7 +91766,7 @@
$as_echo_n "checking how to build vfs_syncops... " >&6; }
if test "$MODULE_vfs_syncops"; then
DEST=$MODULE_vfs_syncops
-@@ -86378,12 +37687,10 @@
+@@ -86386,12 +37695,10 @@
if test x"$DEST" = xSHARED; then
@@ -91790,7 +91781,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -86394,16 +37701,16 @@
+@@ -86402,16 +37709,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
@@ -91810,7 +91801,7 @@
$as_echo_n "checking how to build vfs_zfsacl... " >&6; }
if test "$MODULE_vfs_zfsacl"; then
DEST=$MODULE_vfs_zfsacl
-@@ -86415,12 +37722,10 @@
+@@ -86423,12 +37730,10 @@
if test x"$DEST" = xSHARED; then
@@ -91825,7 +91816,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -86431,16 +37736,16 @@
+@@ -86439,16 +37744,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
@@ -91845,7 +91836,7 @@
$as_echo_n "checking how to build vfs_notify_fam... " >&6; }
if test "$MODULE_vfs_notify_fam"; then
DEST=$MODULE_vfs_notify_fam
-@@ -86452,12 +37757,10 @@
+@@ -86460,12 +37765,10 @@
if test x"$DEST" = xSHARED; then
@@ -91860,7 +91851,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -86468,16 +37771,16 @@
+@@ -86476,16 +37779,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
@@ -91880,7 +91871,7 @@
$as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
if test "$MODULE_vfs_acl_xattr"; then
DEST=$MODULE_vfs_acl_xattr
-@@ -86489,12 +37792,10 @@
+@@ -86497,12 +37800,10 @@
if test x"$DEST" = xSHARED; then
@@ -91895,7 +91886,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -86505,16 +37806,16 @@
+@@ -86513,16 +37814,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
@@ -91915,7 +91906,7 @@
$as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
if test "$MODULE_vfs_acl_tdb"; then
DEST=$MODULE_vfs_acl_tdb
-@@ -86526,12 +37827,10 @@
+@@ -86534,12 +37835,10 @@
if test x"$DEST" = xSHARED; then
@@ -91930,7 +91921,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -86542,16 +37841,16 @@
+@@ -86550,16 +37849,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
@@ -91950,7 +91941,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
-@@ -86563,12 +37862,10 @@
+@@ -86571,12 +37870,10 @@
if test x"$DEST" = xSHARED; then
@@ -91965,7 +91956,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -86579,16 +37876,16 @@
+@@ -86587,16 +37884,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
@@ -91985,7 +91976,7 @@
$as_echo_n "checking how to build vfs_onefs... " >&6; }
if test "$MODULE_vfs_onefs"; then
DEST=$MODULE_vfs_onefs
-@@ -86600,12 +37897,10 @@
+@@ -86608,12 +37905,10 @@
if test x"$DEST" = xSHARED; then
@@ -92000,7 +91991,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -86616,16 +37911,16 @@
+@@ -86624,16 +37919,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
@@ -92020,7 +92011,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
-@@ -86637,12 +37932,10 @@
+@@ -86645,12 +37940,10 @@
if test x"$DEST" = xSHARED; then
@@ -92035,7 +92026,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -86653,16 +37946,16 @@
+@@ -86661,16 +37954,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
@@ -92055,7 +92046,7 @@
$as_echo_n "checking how to build vfs_dirsort... " >&6; }
if test "$MODULE_vfs_dirsort"; then
DEST=$MODULE_vfs_dirsort
-@@ -86674,12 +37967,10 @@
+@@ -86682,12 +37975,10 @@
if test x"$DEST" = xSHARED; then
@@ -92070,7 +92061,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -86690,11 +37981,11 @@
+@@ -86698,11 +37989,11 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
@@ -92084,7 +92075,7 @@
$as_echo "not" >&6; }
fi
-@@ -86716,7 +38007,7 @@
+@@ -86724,7 +38015,7 @@
@@ -92093,7 +92084,7 @@
$as_echo_n "checking how to build perfcount_onefs... " >&6; }
if test "$MODULE_perfcount_onefs"; then
DEST=$MODULE_perfcount_onefs
-@@ -86728,12 +38019,10 @@
+@@ -86736,12 +38027,10 @@
if test x"$DEST" = xSHARED; then
@@ -92108,7 +92099,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -86744,16 +38033,16 @@
+@@ -86752,16 +38041,16 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
@@ -92128,7 +92119,7 @@
$as_echo_n "checking how to build perfcount_test... " >&6; }
if test "$MODULE_perfcount_test"; then
DEST=$MODULE_perfcount_test
-@@ -86765,12 +38054,10 @@
+@@ -86773,12 +38062,10 @@
if test x"$DEST" = xSHARED; then
@@ -92143,7 +92134,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_test"
-@@ -86781,11 +38068,11 @@
+@@ -86789,11 +38076,11 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
@@ -92157,7 +92148,7 @@
$as_echo "not" >&6; }
fi
-@@ -86806,7 +38093,7 @@
+@@ -86814,7 +38101,7 @@
@@ -92166,7 +92157,7 @@
$as_echo_n "checking how to build gpext_registry... " >&6; }
if test "$MODULE_gpext_registry"; then
DEST=$MODULE_gpext_registry
-@@ -86818,12 +38105,10 @@
+@@ -86826,12 +38113,10 @@
if test x"$DEST" = xSHARED; then
@@ -92181,7 +92172,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_registry"
-@@ -86834,16 +38119,16 @@
+@@ -86842,16 +38127,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
@@ -92201,7 +92192,7 @@
$as_echo_n "checking how to build gpext_scripts... " >&6; }
if test "$MODULE_gpext_scripts"; then
DEST=$MODULE_gpext_scripts
-@@ -86855,12 +38140,10 @@
+@@ -86863,12 +38148,10 @@
if test x"$DEST" = xSHARED; then
@@ -92216,7 +92207,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -86871,16 +38154,16 @@
+@@ -86879,16 +38162,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
@@ -92236,7 +92227,7 @@
$as_echo_n "checking how to build gpext_security... " >&6; }
if test "$MODULE_gpext_security"; then
DEST=$MODULE_gpext_security
-@@ -86892,12 +38175,10 @@
+@@ -86900,12 +38183,10 @@
if test x"$DEST" = xSHARED; then
@@ -92251,7 +92242,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_security"
-@@ -86908,11 +38189,11 @@
+@@ -86916,11 +38197,11 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
@@ -92265,7 +92256,7 @@
$as_echo "not" >&6; }
fi
-@@ -86948,18 +38229,16 @@
+@@ -86956,18 +38237,16 @@
#################################################
# If run from the build farm, enable NASTY hacks
#################################################
@@ -92288,7 +92279,7 @@
$as_echo "no" >&6; }
fi
-@@ -86976,11 +38255,11 @@
+@@ -86984,11 +38263,11 @@
rt_signal_lease_works=yes
rt_signal_aio_works=yes
@@ -92303,7 +92294,7 @@
$as_echo "cross" >&6; }
# cross compiling, I hope you know what you are doing
-@@ -86988,11 +38267,7 @@
+@@ -86996,11 +38275,7 @@
else
@@ -92316,7 +92307,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -87051,41 +38326,16 @@
+@@ -87059,41 +38334,16 @@
}
_ACEOF
@@ -92362,7 +92353,7 @@
/* end confdefs.h. */
int
-@@ -87096,61 +38346,31 @@
+@@ -87104,61 +38354,31 @@
return 0;
}
_ACEOF
@@ -92431,7 +92422,7 @@
$as_echo "no" >&6; }
case "$ac_status" in
1|11|101|111) rt_signal_lease_ok=no ;;
-@@ -87164,13 +38384,9 @@
+@@ -87172,13 +38392,9 @@
# no RT_SIGNAL bug, we are golden
@@ -92447,7 +92438,7 @@
/* end confdefs.h. */
int
-@@ -87181,65 +38397,39 @@
+@@ -87189,65 +38405,39 @@
return 0;
}
_ACEOF
@@ -92522,7 +92513,7 @@
enableval=$enable_merged_build; enable_merged_build=$enableval
else
enable_merged_build=auto
-@@ -87248,9 +38438,7 @@
+@@ -87256,9 +38446,7 @@
if test x"$enable_merged_build" = x"yes" -a \
x"$merged_build_possible" = x"no" ; then
@@ -92533,7 +92524,7 @@
fi
-@@ -87273,9 +38461,9 @@
+@@ -87281,9 +38469,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
@@ -92545,7 +92536,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -87288,14 +38476,14 @@
+@@ -87296,14 +38484,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -92563,7 +92554,7 @@
IFS=$as_save_IFS
;;
-@@ -87303,10 +38491,10 @@
+@@ -87311,10 +38499,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -92576,7 +92567,7 @@
$as_echo "no" >&6; }
fi
-@@ -87317,9 +38505,9 @@
+@@ -87325,9 +38513,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
@@ -92588,7 +92579,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -87332,14 +38520,14 @@
+@@ -87340,14 +38528,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -92606,7 +92597,7 @@
IFS=$as_save_IFS
;;
-@@ -87347,10 +38535,10 @@
+@@ -87355,10 +38543,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -92619,7 +92610,7 @@
$as_echo "no" >&6; }
fi
-@@ -87358,7 +38546,7 @@
+@@ -87366,7 +38554,7 @@
fi
if test -z "$PYTHON"; then
working_python=no
@@ -92628,7 +92619,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -87369,9 +38557,9 @@
+@@ -87377,9 +38565,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
@@ -92640,7 +92631,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -87384,14 +38572,14 @@
+@@ -87392,14 +38580,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -92658,7 +92649,7 @@
IFS=$as_save_IFS
;;
-@@ -87399,10 +38587,10 @@
+@@ -87407,10 +38595,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -92671,7 +92662,7 @@
$as_echo "no" >&6; }
fi
-@@ -87413,9 +38601,9 @@
+@@ -87421,9 +38609,9 @@
else
# Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args.
set dummy python$PYTHON_VER-config; ac_word=$2
@@ -92683,7 +92674,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -87428,14 +38616,14 @@
+@@ -87436,14 +38624,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -92701,7 +92692,7 @@
IFS=$as_save_IFS
;;
-@@ -87443,10 +38631,10 @@
+@@ -87451,10 +38639,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -92714,7 +92705,7 @@
$as_echo "no" >&6; }
fi
-@@ -87454,7 +38642,7 @@
+@@ -87462,7 +38650,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -92723,7 +92714,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -87464,11 +38652,7 @@
+@@ -87472,11 +38660,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -92736,7 +92727,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -87485,42 +38669,15 @@
+@@ -87493,42 +38677,15 @@
return 0;
}
_ACEOF
@@ -92782,7 +92773,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -87532,11 +38689,7 @@
+@@ -87540,11 +38697,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -92795,7 +92786,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -87553,42 +38706,15 @@
+@@ -87561,42 +38714,15 @@
return 0;
}
_ACEOF
@@ -92841,7 +92832,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -87603,11 +38729,7 @@
+@@ -87611,11 +38737,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -92854,7 +92845,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -87624,42 +38746,15 @@
+@@ -87632,42 +38754,15 @@
return 0;
}
_ACEOF
@@ -92900,7 +92891,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -87671,11 +38766,7 @@
+@@ -87679,11 +38774,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -92913,7 +92904,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -87692,42 +38783,15 @@
+@@ -87700,42 +38791,15 @@
return 0;
}
_ACEOF
@@ -92959,7 +92950,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -87757,11 +38821,7 @@
+@@ -87765,11 +38829,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -92972,7 +92963,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -87778,64 +38838,37 @@
+@@ -87786,64 +38846,37 @@
return 0;
}
_ACEOF
@@ -93045,7 +93036,7 @@
$as_echo "$merged_build_possible" >&6; }
# Enable merged build automatically if possible, when in developer mode
-@@ -87891,9 +38924,9 @@
+@@ -87899,9 +38932,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
@@ -93057,7 +93048,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -87906,14 +38939,14 @@
+@@ -87914,14 +38947,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93075,7 +93066,7 @@
IFS=$as_save_IFS
;;
-@@ -87921,10 +38954,10 @@
+@@ -87929,10 +38962,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -93088,7 +93079,7 @@
$as_echo "no" >&6; }
fi
-@@ -87935,9 +38968,9 @@
+@@ -87943,9 +38976,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
@@ -93100,7 +93091,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -87950,14 +38983,14 @@
+@@ -87958,14 +38991,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93118,7 +93109,7 @@
IFS=$as_save_IFS
;;
-@@ -87965,10 +38998,10 @@
+@@ -87973,10 +39006,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -93131,7 +93122,7 @@
$as_echo "no" >&6; }
fi
-@@ -87976,7 +39009,7 @@
+@@ -87984,7 +39017,7 @@
fi
if test -z "$PYTHON"; then
working_python=no
@@ -93140,7 +93131,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -87987,9 +39020,9 @@
+@@ -87995,9 +39028,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
@@ -93152,7 +93143,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -88002,14 +39035,14 @@
+@@ -88010,14 +39043,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93170,7 +93161,7 @@
IFS=$as_save_IFS
;;
-@@ -88017,10 +39050,10 @@
+@@ -88025,10 +39058,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -93183,7 +93174,7 @@
$as_echo "no" >&6; }
fi
-@@ -88031,9 +39064,9 @@
+@@ -88039,9 +39072,9 @@
else
# Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args.
set dummy python$PYTHON_VER-config; ac_word=$2
@@ -93195,7 +93186,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -88046,14 +39079,14 @@
+@@ -88054,14 +39087,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93213,7 +93204,7 @@
IFS=$as_save_IFS
;;
-@@ -88061,10 +39094,10 @@
+@@ -88069,10 +39102,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -93226,7 +93217,7 @@
$as_echo "no" >&6; }
fi
-@@ -88072,7 +39105,7 @@
+@@ -88080,7 +39113,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -93235,7 +93226,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -88082,11 +39115,7 @@
+@@ -88090,11 +39123,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -93248,7 +93239,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88103,42 +39132,15 @@
+@@ -88111,42 +39140,15 @@
return 0;
}
_ACEOF
@@ -93294,7 +93285,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88150,11 +39152,7 @@
+@@ -88158,11 +39160,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -93307,7 +93298,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88171,42 +39169,15 @@
+@@ -88179,42 +39177,15 @@
return 0;
}
_ACEOF
@@ -93353,7 +93344,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88221,11 +39192,7 @@
+@@ -88229,11 +39200,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -93366,7 +93357,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88242,42 +39209,15 @@
+@@ -88250,42 +39217,15 @@
return 0;
}
_ACEOF
@@ -93412,7 +93403,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88289,11 +39229,7 @@
+@@ -88297,11 +39237,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -93425,7 +93416,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88310,42 +39246,15 @@
+@@ -88318,42 +39254,15 @@
return 0;
}
_ACEOF
@@ -93471,7 +93462,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88375,11 +39284,7 @@
+@@ -88383,11 +39292,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -93484,7 +93475,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88396,52 +39301,25 @@
+@@ -88404,52 +39309,25 @@
return 0;
}
_ACEOF
@@ -93542,7 +93533,7 @@
$as_echo "yes" >&6; }
-@@ -88469,20 +39347,18 @@
+@@ -88477,20 +39355,18 @@
else
@@ -93567,7 +93558,7 @@
$as_echo "$pythondir" >&6; }
-@@ -88497,553 +39373,133 @@
+@@ -88505,553 +39381,133 @@
@@ -94208,7 +94199,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89061,63 +39517,32 @@
+@@ -89069,63 +39525,32 @@
return 0;
}
_ACEOF
@@ -94283,7 +94274,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89135,43 +39560,18 @@
+@@ -89143,43 +39568,18 @@
return 0;
}
_ACEOF
@@ -94333,7 +94324,7 @@
TERMLIBS="-lreadline $TERMLIBS"
EXTERNAL_READLINE=yes
break
-@@ -89185,11 +39585,11 @@
+@@ -89193,11 +39593,11 @@
;;
no)
@@ -94347,7 +94338,7 @@
$as_echo "yes" >&6; }
# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -89201,151 +39601,12 @@
+@@ -89209,151 +39609,12 @@
LDFLAGS="-L$with_readline/lib $LDFLAGS"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
@@ -94505,7 +94496,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -89354,151 +39615,12 @@
+@@ -89362,151 +39623,12 @@
done
@@ -94662,7 +94653,7 @@
_ACEOF
fi
-@@ -89506,168 +39628,26 @@
+@@ -89514,168 +39636,26 @@
done
@@ -94840,7 +94831,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89685,63 +39665,32 @@
+@@ -89693,63 +39673,32 @@
return 0;
}
_ACEOF
@@ -94915,7 +94906,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89759,43 +39708,18 @@
+@@ -89767,43 +39716,18 @@
return 0;
}
_ACEOF
@@ -94965,7 +94956,7 @@
TERMLDFLAGS="-L$with_readline/lib"
TERMCPPFLAGS="-I$with_readline/include"
LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -89815,7 +39739,7 @@
+@@ -89823,7 +39747,7 @@
;;
esac
else
@@ -94974,7 +94965,7 @@
$as_echo "no" >&6; }
fi
-@@ -89824,18 +39748,14 @@
+@@ -89832,18 +39756,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.
@@ -94996,7 +94987,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89848,142 +39768,53 @@
+@@ -89856,142 +39776,53 @@
int
main ()
{
@@ -95170,7 +95161,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -90001,60 +39832,31 @@
+@@ -90009,60 +39840,31 @@
return 0;
}
_ACEOF
@@ -95241,7 +95232,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -90109,7 +39911,7 @@
+@@ -90117,7 +39919,7 @@
###################################
"
@@ -95250,7 +95241,7 @@
$as_echo "no" >&6; }
fi
-@@ -90118,102 +39920,9 @@
+@@ -90126,102 +39928,9 @@
@@ -95355,7 +95346,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -90222,102 +39931,9 @@
+@@ -90230,102 +39939,9 @@
fi
@@ -95460,7 +95451,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -90327,151 +39943,12 @@
+@@ -90335,151 +39951,12 @@
fi
@@ -95616,7 +95607,7 @@
_ACEOF
else
-@@ -90481,151 +39958,12 @@
+@@ -90489,151 +39966,12 @@
done
@@ -95772,7 +95763,7 @@
_ACEOF
else
-@@ -90635,29 +39973,6 @@
+@@ -90643,29 +39981,6 @@
done
@@ -95802,7 +95793,7 @@
for ac_header in \
crypt.h \
curses.h \
-@@ -90683,147 +39998,11 @@
+@@ -90691,147 +40006,11 @@
netinet6/in6.h \
libintl.h
@@ -95955,7 +95946,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -90833,42 +40012,6 @@
+@@ -90841,42 +40020,6 @@
done
@@ -95998,7 +95989,7 @@
for ac_func in \
atexit \
cgetent \
-@@ -90901,271 +40044,65 @@
+@@ -90909,271 +40052,65 @@
warn \
errx \
warnx \
@@ -96307,7 +96298,7 @@
_ACEOF
fi
-@@ -91181,11 +40118,11 @@
+@@ -91189,11 +40126,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -96321,7 +96312,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -91195,17 +40132,13 @@
+@@ -91203,17 +40140,13 @@
@@ -96342,7 +96333,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_BSWAP_H
#include <sys/bswap.h>
-@@ -91218,140 +40151,25 @@
+@@ -91226,140 +40159,25 @@
return 0;
}
_ACEOF
@@ -96492,7 +96483,7 @@
_ACEOF
fi
-@@ -91367,11 +40185,11 @@
+@@ -91375,11 +40193,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -96506,7 +96497,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -91382,25 +40200,21 @@
+@@ -91390,25 +40208,21 @@
@@ -96536,7 +96527,7 @@
ac_cv_struct_winsize=yes; break
fi
rm -f conftest*
-@@ -91410,63 +40224,45 @@
+@@ -91418,63 +40232,45 @@
if test "$ac_cv_struct_winsize" = "yes"; then
@@ -96611,7 +96602,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -91479,35 +40275,14 @@
+@@ -91487,35 +40283,14 @@
return 0;
}
_ACEOF
@@ -96650,7 +96641,7 @@
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -91517,9 +40292,7 @@
+@@ -91525,9 +40300,7 @@
if test "$ac_cv_type_signal" = "void" ; then
@@ -96661,7 +96652,7 @@
fi
-@@ -91550,18 +40323,14 @@
+@@ -91558,18 +40331,14 @@
@@ -96683,7 +96674,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -91578,44 +40347,15 @@
+@@ -91586,44 +40355,15 @@
return 0;
}
_ACEOF
@@ -96733,7 +96724,7 @@
/* end confdefs.h. */
extern int h_errno;
int foo(void) { return h_errno; }
-@@ -91627,44 +40367,19 @@
+@@ -91635,44 +40375,19 @@
return 0;
}
_ACEOF
@@ -96783,7 +96774,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -91672,81 +40387,23 @@
+@@ -91680,81 +40395,23 @@
#define HAVE_H_ERRNO 1
_ACEOF
@@ -96871,7 +96862,7 @@
fi
-@@ -91762,151 +40419,12 @@
+@@ -91770,151 +40427,12 @@
@@ -97028,7 +97019,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -91918,23 +40436,17 @@
+@@ -91926,23 +40444,17 @@
@@ -97055,7 +97046,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91952,54 +40464,28 @@
+@@ -91960,54 +40472,28 @@
return 0;
}
_ACEOF
@@ -97117,7 +97108,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUTIL 1
_ACEOF
-@@ -92016,7 +40502,6 @@
+@@ -92024,7 +40510,6 @@
fi
@@ -97125,7 +97116,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
OPENPTY_ENABLE = YES
"
-@@ -92036,23 +40521,17 @@
+@@ -92044,23 +40529,17 @@
@@ -97152,7 +97143,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92070,54 +40549,28 @@
+@@ -92078,54 +40557,28 @@
return 0;
}
_ACEOF
@@ -97214,7 +97205,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
-@@ -92134,7 +40587,6 @@
+@@ -92142,7 +40595,6 @@
fi
@@ -97222,7 +97213,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
INTL_ENABLE = YES
"
-@@ -92158,150 +40610,12 @@
+@@ -92166,150 +40618,12 @@
@@ -97378,7 +97369,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -92311,22 +40625,9 @@
+@@ -92319,22 +40633,9 @@
done
@@ -97403,7 +97394,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -92337,46 +40638,10 @@
+@@ -92345,46 +40646,10 @@
#include <arpa/nameser.h>
#endif
@@ -97453,7 +97444,7 @@
_ACEOF
fi
-@@ -92388,9 +40653,9 @@
+@@ -92396,9 +40661,9 @@
@@ -97465,7 +97456,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -92405,11 +40670,7 @@
+@@ -92413,11 +40678,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -97478,7 +97469,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -92431,148 +40692,31 @@
+@@ -92439,148 +40700,31 @@
{
res_search(0,0,0,0,0)
;
@@ -97648,7 +97639,7 @@
_ACEOF
fi
-@@ -92592,13 +40736,13 @@
+@@ -92600,13 +40744,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -97664,7 +97655,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -92612,7 +40756,7 @@
+@@ -92620,7 +40764,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -97673,7 +97664,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -92627,9 +40771,9 @@
+@@ -92635,9 +40779,9 @@
@@ -97685,7 +97676,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -92644,11 +40788,7 @@
+@@ -92652,11 +40796,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -97698,7 +97689,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -92673,38 +40813,11 @@
+@@ -92681,38 +40821,11 @@
return 0;
}
_ACEOF
@@ -97740,7 +97731,7 @@
done
eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
LIBS="$ac_save_LIBS"
-@@ -92716,102 +40829,12 @@
+@@ -92724,102 +40837,12 @@
eval "ac_res=\$ac_cv_funclib_res_nsearch"
if false; then
@@ -97848,7 +97839,7 @@
_ACEOF
fi
-@@ -92831,13 +40854,13 @@
+@@ -92839,13 +40862,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -97864,7 +97855,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -92851,7 +40874,7 @@
+@@ -92859,7 +40882,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -97873,7 +97864,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -92866,9 +40889,9 @@
+@@ -92874,9 +40897,9 @@
@@ -97885,7 +97876,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -92883,11 +40906,7 @@
+@@ -92891,11 +40914,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -97898,7 +97889,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -92912,38 +40931,11 @@
+@@ -92920,38 +40939,11 @@
return 0;
}
_ACEOF
@@ -97940,7 +97931,7 @@
done
eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
LIBS="$ac_save_LIBS"
-@@ -92955,102 +40947,12 @@
+@@ -92963,102 +40955,12 @@
eval "ac_res=\$ac_cv_funclib_res_ndestroy"
if false; then
@@ -98048,7 +98039,7 @@
_ACEOF
fi
-@@ -93070,13 +40972,13 @@
+@@ -93078,13 +40980,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -98064,7 +98055,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -93090,7 +40992,7 @@
+@@ -93098,7 +41000,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -98073,7 +98064,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -93104,9 +41006,9 @@
+@@ -93112,9 +41014,9 @@
@@ -98085,7 +98076,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93121,11 +41023,7 @@
+@@ -93129,11 +41031,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -98098,7 +98089,7 @@
/* end confdefs.h. */
#ifdef HAVE_DNS_H
-@@ -93140,38 +41038,11 @@
+@@ -93148,38 +41046,11 @@
return 0;
}
_ACEOF
@@ -98140,7 +98131,7 @@
done
eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}"
LIBS="$ac_save_LIBS"
-@@ -93183,102 +41054,12 @@
+@@ -93191,102 +41062,12 @@
eval "ac_res=\$ac_cv_funclib_dns_search"
if false; then
@@ -98248,7 +98239,7 @@
_ACEOF
fi
-@@ -93298,13 +41079,13 @@
+@@ -93306,13 +41087,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -98264,7 +98255,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -93318,7 +41099,7 @@
+@@ -93326,7 +41107,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -98273,7 +98264,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -93330,9 +41111,9 @@
+@@ -93338,9 +41119,9 @@
@@ -98285,7 +98276,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93347,11 +41128,7 @@
+@@ -93355,11 +41136,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -98298,7 +98289,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -93376,38 +41153,11 @@
+@@ -93384,38 +41161,11 @@
return 0;
}
_ACEOF
@@ -98340,7 +98331,7 @@
done
eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
LIBS="$ac_save_LIBS"
-@@ -93419,102 +41169,12 @@
+@@ -93427,102 +41177,12 @@
eval "ac_res=\$ac_cv_funclib_dn_expand"
if false; then
@@ -98448,7 +98439,7 @@
_ACEOF
fi
-@@ -93534,13 +41194,13 @@
+@@ -93542,13 +41202,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -98464,7 +98455,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -93554,7 +41214,7 @@
+@@ -93562,7 +41222,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -98473,7 +98464,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -93566,18 +41226,14 @@
+@@ -93574,18 +41234,14 @@
@@ -98495,7 +98486,7 @@
/* end confdefs.h. */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -93601,44 +41257,15 @@
+@@ -93609,44 +41265,15 @@
return 0;
}
_ACEOF
@@ -98545,7 +98536,7 @@
/* end confdefs.h. */
extern int _res;
int foo(void) { return _res; }
-@@ -93650,44 +41277,19 @@
+@@ -93658,44 +41285,19 @@
return 0;
}
_ACEOF
@@ -98595,7 +98586,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -93695,18 +41297,7 @@
+@@ -93703,18 +41305,7 @@
#define HAVE__RES 1
_ACEOF
@@ -98615,7 +98606,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -93719,64 +41310,17 @@
+@@ -93727,64 +41318,17 @@
#ifdef HAVE_RESOLV_H
#include <resolv.h>
#endif
@@ -98685,7 +98676,7 @@
fi
-@@ -93842,9 +41386,9 @@
+@@ -93850,9 +41394,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
@@ -98697,7 +98688,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -93855,24 +41399,24 @@
+@@ -93863,24 +41407,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -98727,7 +98718,7 @@
$as_echo "no" >&6; }
fi
-@@ -93901,20 +41445,20 @@
+@@ -93909,20 +41453,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -98755,7 +98746,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93923,19 +41467,17 @@
+@@ -93931,19 +41475,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
@@ -98779,7 +98770,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93943,55 +41485,29 @@
+@@ -93951,55 +41493,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -98843,7 +98834,7 @@
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -94000,52 +41516,24 @@
+@@ -94008,52 +41524,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -98903,7 +98894,7 @@
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -94055,9 +41543,9 @@
+@@ -94063,9 +41551,9 @@
if test x"$LEX_BASENAME" = x"flex"; then
# "flex 2.5.33"
FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -98915,7 +98906,7 @@
$as_echo "$FLEX_VERSION" >&6; }
FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -94070,9 +41558,9 @@
+@@ -94078,9 +41566,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
@@ -98927,7 +98918,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -94083,24 +41571,24 @@
+@@ -94091,24 +41579,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -98957,7 +98948,7 @@
$as_echo "no" >&6; }
fi
-@@ -94113,9 +41601,9 @@
+@@ -94121,9 +41609,9 @@
if test x"$YACC_BASENAME" = x"bison -y"; then
# bison (GNU Bison) 2.3
BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -98969,7 +98960,7 @@
$as_echo "$BISON_VERSION" >&6; }
BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -94123,7 +41611,7 @@
+@@ -94131,7 +41619,7 @@
YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
fi
@@ -98978,7 +98969,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
-@@ -94139,7 +41627,7 @@
+@@ -94147,7 +41635,7 @@
LEX=false
YACC=false
fi
@@ -98987,7 +98978,7 @@
$as_echo "$LEX_YACC" >&6; }
# Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -94147,21 +41635,15 @@
+@@ -94155,21 +41643,15 @@
# if we ever get to using a host kerberos, we might add conditionals here
@@ -99012,7 +99003,7 @@
HAVE_GSSAPI=YES
-@@ -94241,193 +41723,48 @@
+@@ -94249,193 +41731,48 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";"
@@ -99234,7 +99225,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -94445,46 +41782,15 @@
+@@ -94453,46 +41790,15 @@
return 0;
}
_ACEOF
@@ -99285,7 +99276,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -94502,65 +41808,32 @@
+@@ -94510,65 +41816,32 @@
return 0;
}
_ACEOF
@@ -99359,7 +99350,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. */
-@@ -94601,43 +41874,18 @@
+@@ -94609,43 +41882,18 @@
return 0;
}
_ACEOF
@@ -99409,7 +99400,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BACKTRACE 1
_ACEOF
-@@ -94645,7 +41893,6 @@
+@@ -94653,7 +41901,6 @@
fi
@@ -99417,7 +99408,7 @@
if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -94731,102 +41978,12 @@
+@@ -94739,102 +41986,12 @@
@@ -99525,7 +99516,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -94835,102 +41992,12 @@
+@@ -94843,102 +42000,12 @@
done
@@ -99632,7 +99623,7 @@
_ACEOF
fi
-@@ -94939,153 +42006,14 @@
+@@ -94947,153 +42014,14 @@
#################################################
# these tests are taken from the GNU fileutils package
@@ -99792,7 +99783,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -95095,65 +42023,16 @@
+@@ -95103,65 +42031,16 @@
done
@@ -99863,7 +99854,7 @@
_ACEOF
fi
-@@ -95166,19 +42045,15 @@
+@@ -95174,19 +42053,15 @@
# Test for statvfs64.
if test $space = no; then
# SVR4
@@ -99887,7 +99878,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -95192,51 +42067,22 @@
+@@ -95200,51 +42075,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -99945,7 +99936,7 @@
fi
fi
-@@ -95249,16 +42095,12 @@
+@@ -95257,16 +42103,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -99965,7 +99956,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -95270,64 +42112,33 @@
+@@ -95278,64 +42120,33 @@
return 0;
}
_ACEOF
@@ -100039,7 +100030,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -95339,59 +42150,32 @@
+@@ -95347,59 +42158,32 @@
return 0;
}
_ACEOF
@@ -100107,7 +100098,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -95404,71 +42188,38 @@
+@@ -95412,71 +42196,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -100189,7 +100180,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -95487,71 +42238,38 @@
+@@ -95495,71 +42246,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -100271,7 +100262,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -95561,71 +42279,38 @@
+@@ -95569,71 +42287,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -100353,7 +100344,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -95641,71 +42326,38 @@
+@@ -95649,71 +42334,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -100435,7 +100426,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -95725,201 +42377,33 @@
+@@ -95733,201 +42385,33 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -100660,7 +100651,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -95928,19 +42412,15 @@
+@@ -95936,19 +42420,15 @@
done
@@ -100683,7 +100674,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -95958,46 +42438,15 @@
+@@ -95966,46 +42446,15 @@
return 0;
}
_ACEOF
@@ -100734,7 +100725,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96015,65 +42464,32 @@
+@@ -96023,65 +42472,32 @@
return 0;
}
_ACEOF
@@ -100808,7 +100799,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. */
-@@ -96114,50 +42530,24 @@
+@@ -96122,50 +42538,24 @@
return 0;
}
_ACEOF
@@ -100865,7 +100856,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
XATTR_LIBS = ${XATTR_LIBS}
XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -96167,18 +42557,14 @@
+@@ -96175,18 +42565,14 @@
if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -100887,7 +100878,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -96201,48 +42587,23 @@
+@@ -96209,48 +42595,23 @@
return 0;
}
_ACEOF
@@ -100941,7 +100932,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -96254,20 +42615,16 @@
+@@ -96262,20 +42623,16 @@
fi
@@ -100966,7 +100957,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/capability.h>
-@@ -96282,117 +42639,55 @@
+@@ -96290,117 +42647,55 @@
}
_ACEOF
@@ -101100,7 +101091,7 @@
fi
-@@ -96400,7 +42695,7 @@
+@@ -96408,7 +42703,7 @@
INCLUDED_POPT=auto
# Check whether --with-included-popt was given.
@@ -101109,7 +101100,7 @@
withval=$with_included_popt; INCLUDED_POPT=$withval
fi
-@@ -96409,169 +42704,26 @@
+@@ -96417,169 +42712,26 @@
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -101287,7 +101278,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96589,43 +42741,18 @@
+@@ -96597,43 +42749,18 @@
return 0;
}
_ACEOF
@@ -101337,7 +101328,7 @@
POPT_LIBS="-lpopt"
fi
-@@ -96637,9 +42764,9 @@
+@@ -96645,9 +42772,9 @@
fi
fi
@@ -101349,7 +101340,7 @@
$as_echo "$INCLUDED_POPT" >&6; }
if test x"$INCLUDED_POPT" != x"no"; then
poptdir=""
-@@ -96653,156 +42780,16 @@
+@@ -96661,156 +42788,16 @@
fi
done
if test x"$poptdir" = "x"; then
@@ -101513,7 +101504,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -96841,12 +42828,10 @@
+@@ -96849,12 +42836,10 @@
LOOK_DIRS="/usr /usr/local /sw"
# Check whether --with-libiconv was given.
@@ -101528,7 +101519,7 @@
else
if test "$withval" != "yes" ; then
-@@ -96858,26 +42843,20 @@
+@@ -96866,26 +42851,20 @@
LIBS=-liconv
@@ -101563,7 +101554,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -96890,33 +42869,10 @@
+@@ -96898,33 +42877,10 @@
}
_ACEOF
@@ -101600,7 +101591,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -96924,29 +42880,17 @@
+@@ -96932,29 +42888,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -101635,7 +101626,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -96959,33 +42903,10 @@
+@@ -96967,33 +42911,10 @@
}
_ACEOF
@@ -101672,7 +101663,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -96993,28 +42914,17 @@
+@@ -97001,28 +42922,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -101707,7 +101698,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -97027,33 +42937,10 @@
+@@ -97035,33 +42945,10 @@
}
_ACEOF
@@ -101744,7 +101735,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97061,31 +42948,22 @@
+@@ -97069,31 +42956,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -101782,7 +101773,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -97098,17 +42976,13 @@
+@@ -97106,17 +42984,13 @@
if test x$ICONV_FOUND = xno; then
@@ -101804,7 +101795,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -97121,49 +42995,20 @@
+@@ -97129,49 +43003,20 @@
}
_ACEOF
@@ -101860,7 +101851,7 @@
fi
for i in $LOOK_DIRS ; do
-@@ -97180,24 +43025,20 @@
+@@ -97188,24 +43033,20 @@
LIBS=-liconv
@@ -101892,7 +101883,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -97210,33 +43051,10 @@
+@@ -97218,33 +43059,10 @@
}
_ACEOF
@@ -101929,7 +101920,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97244,27 +43062,17 @@
+@@ -97252,27 +43070,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -101961,7 +101952,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -97277,33 +43085,10 @@
+@@ -97285,33 +43093,10 @@
}
_ACEOF
@@ -101998,7 +101989,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97311,26 +43096,17 @@
+@@ -97319,26 +43104,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -102030,7 +102021,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -97342,304 +43118,92 @@
+@@ -97350,304 +43126,92 @@
return 0;
}
@@ -102402,7 +102393,7 @@
_ACEOF
fi
-@@ -97718,151 +43282,12 @@
+@@ -97726,151 +43290,12 @@
@@ -102558,7 +102549,7 @@
_ACEOF
fi
-@@ -97872,23 +43297,17 @@
+@@ -97880,23 +43305,17 @@
@@ -102585,7 +102576,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97906,54 +43325,28 @@
+@@ -97914,54 +43333,28 @@
return 0;
}
_ACEOF
@@ -102647,7 +102638,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -97969,18 +43362,13 @@
+@@ -97977,18 +43370,13 @@
fi
@@ -102669,7 +102660,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -97998,40 +43386,19 @@
+@@ -98006,40 +43394,19 @@
return 0;
}
_ACEOF
@@ -102712,7 +102703,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -98090,9 +43457,9 @@
+@@ -98098,9 +43465,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
@@ -102724,7 +102715,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -98105,14 +43472,14 @@
+@@ -98113,14 +43480,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -102742,7 +102733,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -98121,10 +43488,10 @@
+@@ -98129,10 +43496,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -102755,7 +102746,7 @@
$as_echo "no" >&6; }
fi
-@@ -98140,52 +43507,27 @@
+@@ -98148,52 +43515,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -102815,7 +102806,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTALLOC_ENABLE = YES
-@@ -98193,22 +43535,16 @@
+@@ -98201,22 +43543,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBTALLOC\"} = \"YES\";"
@@ -102842,7 +102833,7 @@
CFLAGS="$OLD_CFLAGS"
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 @@
+@@ -98277,7 +43613,7 @@
ac_cv_LIBTALLOC_found=yes
else
@@ -102851,7 +102842,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.0'
ac_cv_LIBTALLOC_found=no
-@@ -98303,9 +43639,9 @@
+@@ -98311,9 +43647,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
@@ -102863,7 +102854,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -98318,14 +43654,14 @@
+@@ -98326,14 +43662,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -102881,7 +102872,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -98334,10 +43670,10 @@
+@@ -98342,10 +43678,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -102894,7 +102885,7 @@
$as_echo "no" >&6; }
fi
-@@ -98353,52 +43689,27 @@
+@@ -98361,52 +43697,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -102954,7 +102945,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTDB_ENABLE = YES
-@@ -98406,22 +43717,16 @@
+@@ -98414,22 +43725,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBTDB\"} = \"YES\";"
@@ -102981,7 +102972,7 @@
CFLAGS="$OLD_CFLAGS"
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 @@
+@@ -98490,7 +43795,7 @@
ac_cv_LIBTDB_found=yes
else
@@ -102990,7 +102981,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.1.7'
ac_cv_LIBTDB_found=no
-@@ -98507,9 +43812,7 @@
+@@ -98515,9 +43820,7 @@
fi
done
if test x"$tdbdir" = "x"; then
@@ -103001,7 +102992,7 @@
fi
TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
-@@ -98522,104 +43825,12 @@
+@@ -98530,104 +43833,12 @@
TDB_CFLAGS="-I$tdbdir/include"
@@ -103111,7 +103102,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -98627,151 +43838,12 @@
+@@ -98635,151 +43846,12 @@
fi
done
@@ -103268,7 +103259,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -98782,17 +43854,13 @@
+@@ -98790,17 +43862,13 @@
@@ -103289,7 +103280,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -98803,56 +43871,29 @@
+@@ -98811,56 +43879,29 @@
return 0;
}
_ACEOF
@@ -103353,7 +103344,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -98863,41 +43904,18 @@
+@@ -98871,41 +43912,18 @@
return 0;
}
_ACEOF
@@ -103399,7 +103390,7 @@
fi
-@@ -98928,9 +43946,9 @@
+@@ -98936,9 +43954,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
@@ -103411,7 +103402,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -98943,14 +43961,14 @@
+@@ -98951,14 +43969,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -103429,7 +103420,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -98959,10 +43977,10 @@
+@@ -98967,10 +43985,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -103442,7 +103433,7 @@
$as_echo "no" >&6; }
fi
-@@ -98978,52 +43996,27 @@
+@@ -98986,52 +44004,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -103502,7 +103493,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTEVENT_ENABLE = YES
-@@ -99031,22 +44024,16 @@
+@@ -99039,22 +44032,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBTEVENT\"} = \"YES\";"
@@ -103529,7 +103520,7 @@
CFLAGS="$OLD_CFLAGS"
ac_cv_LIBTEVENT_libs_only_other="`$PKG_CONFIG --libs-only-other 'tevent = 0.9.8'` `$PKG_CONFIG --libs-only-L 'tevent = 0.9.8'`"
-@@ -99107,7 +44094,7 @@
+@@ -99115,7 +44102,7 @@
ac_cv_LIBTEVENT_found=yes
else
@@ -103538,7 +103529,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = 0.9.8'
ac_cv_LIBTEVENT_found=no
-@@ -99128,281 +44115,50 @@
+@@ -99136,281 +44123,50 @@
if test x"$teventdir" = "x"; then
teventdir=""
@@ -103851,7 +103842,7 @@
_ACEOF
fi
-@@ -99411,9 +44167,7 @@
+@@ -99419,9 +44175,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"
@@ -103862,7 +103853,7 @@
fi
-@@ -99469,9 +44223,9 @@
+@@ -99477,9 +44231,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
@@ -103874,7 +103865,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -99484,14 +44238,14 @@
+@@ -99492,14 +44246,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -103892,7 +103883,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99500,10 +44254,10 @@
+@@ -99508,10 +44262,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -103905,7 +103896,7 @@
$as_echo "no" >&6; }
fi
-@@ -99519,52 +44273,27 @@
+@@ -99527,52 +44281,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -103965,7 +103956,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBLDB_ENABLE = YES
-@@ -99572,22 +44301,16 @@
+@@ -99580,22 +44309,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBLDB\"} = \"YES\";"
@@ -103992,7 +103983,7 @@
CFLAGS="$OLD_CFLAGS"
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 @@
+@@ -99656,7 +44379,7 @@
ac_cv_LIBLDB_found=yes
else
@@ -104001,7 +103992,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.7'
ac_cv_LIBLDB_found=no
-@@ -99694,12 +44417,12 @@
+@@ -99702,12 +44425,12 @@
SQLITE3_LIBS=""
with_sqlite3_support=no
@@ -104016,7 +104007,7 @@
withval=$with_sqlite3; case "$withval" in
yes|no|auto)
with_sqlite3_support=$withval
-@@ -99708,157 +44431,18 @@
+@@ -99716,157 +44439,18 @@
fi
@@ -104180,7 +104171,7 @@
_ACEOF
fi
-@@ -99868,11 +44452,9 @@
+@@ -99876,11 +44460,9 @@
if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
if test x"$with_sqlite3_support" = x"yes"; then
@@ -104194,7 +104185,7 @@
$as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
fi
-@@ -99887,23 +44469,17 @@
+@@ -99895,23 +44477,17 @@
# now see if we can find the sqlite3 libs in standard paths
@@ -104221,7 +104212,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -99921,54 +44497,28 @@
+@@ -99929,54 +44505,28 @@
return 0;
}
_ACEOF
@@ -104283,7 +104274,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF
-@@ -99984,21 +44534,16 @@
+@@ -99992,21 +44542,16 @@
fi
@@ -104309,7 +104300,7 @@
$as_echo "yes" >&6; }
with_sqlite3_support=yes
-@@ -100010,11 +44555,9 @@
+@@ -100018,11 +44563,9 @@
else
if test x"$with_sqlite3_support" = x"yes"; then
@@ -104323,7 +104314,7 @@
$as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
fi
-@@ -100084,7 +44627,7 @@
+@@ -100092,7 +44635,7 @@
use_gnutls=auto
# Check whether --enable-gnutls was given.
@@ -104332,7 +104323,7 @@
enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
use_gnutls=no
fi
-@@ -100098,9 +44641,9 @@
+@@ -100106,9 +44649,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
@@ -104344,7 +104335,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -100113,14 +44656,14 @@
+@@ -100121,14 +44664,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -104362,7 +104353,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -100129,10 +44672,10 @@
+@@ -100137,10 +44680,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -104375,7 +104366,7 @@
$as_echo "no" >&6; }
fi
-@@ -100148,52 +44691,27 @@
+@@ -100156,52 +44699,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104435,7 +104426,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GNUTLS_ENABLE = YES
-@@ -100201,22 +44719,16 @@
+@@ -100209,22 +44727,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"GNUTLS\"} = \"YES\";"
@@ -104462,7 +104453,7 @@
CFLAGS="$OLD_CFLAGS"
ac_cv_GNUTLS_libs_only_other="`$PKG_CONFIG --libs-only-other 'gnutls >= 1.4.0'` `$PKG_CONFIG --libs-only-L 'gnutls >= 1.4.0'`"
-@@ -100277,7 +44789,7 @@
+@@ -100285,7 +44797,7 @@
ac_cv_GNUTLS_found=yes
else
@@ -104471,7 +104462,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls >= 1.4.0'
ac_cv_GNUTLS_found=no
-@@ -100297,151 +44809,12 @@
+@@ -100305,151 +44817,12 @@
fi
if test x$use_gnutls = xauto; then
@@ -104628,7 +104619,7 @@
_ACEOF
fi
-@@ -100450,23 +44823,17 @@
+@@ -100458,23 +44831,17 @@
@@ -104655,7 +104646,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -100484,580 +44851,116 @@
+@@ -100492,580 +44859,116 @@
return 0;
}
_ACEOF
@@ -105315,7 +105306,7 @@
_ACEOF
fi
-@@ -101066,23 +44969,17 @@
+@@ -101074,23 +44977,17 @@
@@ -105342,7 +105333,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101100,54 +44997,28 @@
+@@ -101108,54 +45005,28 @@
return 0;
}
_ACEOF
@@ -105404,7 +105395,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGCRYPT 1
_ACEOF
-@@ -101163,7 +45034,6 @@
+@@ -101171,7 +45042,6 @@
fi
@@ -105412,7 +105403,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GCRYPT_LIBS = $GCRYPT_LIBS
GCRYPT_CFLAGS =
-@@ -101180,7 +45050,7 @@
+@@ -101188,7 +45058,7 @@
use_netapi=auto
# Check whether --enable-netapi was given.
@@ -105421,7 +105412,7 @@
enableval=$enable_netapi; if test x$enable_netapi = xno; then
use_netapi=no
fi
-@@ -101202,151 +45072,12 @@
+@@ -101210,151 +45080,12 @@
\$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";"
if test x$use_netapi != xno; then
@@ -105578,7 +105569,7 @@
_ACEOF
fi
-@@ -101355,23 +45086,17 @@
+@@ -101363,23 +45094,17 @@
@@ -105605,7 +105596,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101389,54 +45114,28 @@
+@@ -101397,54 +45122,28 @@
return 0;
}
_ACEOF
@@ -105667,7 +105658,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -101453,24 +45152,17 @@
+@@ -101461,24 +45160,17 @@
fi
@@ -105695,7 +105686,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101488,54 +45180,28 @@
+@@ -101496,54 +45188,28 @@
return 0;
}
_ACEOF
@@ -105757,7 +105748,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -101552,24 +45218,17 @@
+@@ -101560,24 +45226,17 @@
fi
@@ -105785,7 +105776,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101587,54 +45246,28 @@
+@@ -101595,54 +45254,28 @@
return 0;
}
_ACEOF
@@ -105847,7 +105838,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -101651,24 +45284,17 @@
+@@ -101659,24 +45292,17 @@
fi
@@ -105875,7 +105866,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101686,54 +45312,28 @@
+@@ -101694,54 +45320,28 @@
return 0;
}
_ACEOF
@@ -105937,7 +105928,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -101750,24 +45350,17 @@
+@@ -101758,24 +45358,17 @@
fi
@@ -105965,7 +105956,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101785,54 +45378,28 @@
+@@ -101793,54 +45386,28 @@
return 0;
}
_ACEOF
@@ -106027,7 +106018,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -101847,12 +45414,9 @@
+@@ -101855,12 +45422,9 @@
fi
@@ -106041,7 +106032,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -101870,9 +45434,7 @@
+@@ -101878,9 +45442,7 @@
else
if test x$use_netapi != xauto; then
@@ -106052,7 +106043,7 @@
fi
fi
-@@ -101913,19 +45475,17 @@
+@@ -101921,19 +45483,17 @@
#################################################
# check for pthread support
@@ -106076,7 +106067,7 @@
fi
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -101943,12 +45503,12 @@
+@@ -101951,12 +45511,12 @@
;;
*)
@@ -106091,7 +106082,7 @@
$as_echo "no" >&6; }
fi
-@@ -101964,274 +45524,45 @@
+@@ -101972,274 +45532,45 @@
@@ -106379,7 +106370,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102249,54 +45580,28 @@
+@@ -102257,54 +45588,28 @@
return 0;
}
_ACEOF
@@ -106441,7 +106432,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSETPROCTITLE 1
_ACEOF
-@@ -102312,15 +45617,14 @@
+@@ -102320,15 +45625,14 @@
fi
@@ -106459,7 +106450,7 @@
$as_echo "yes" >&6; }
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102330,22 +45634,20 @@
+@@ -102338,22 +45642,20 @@
\$enabled{\"SETPROCTITLE\"} = \"YES\";"
@@ -106486,7 +106477,7 @@
$as_echo "no" >&6; }
fi
-@@ -102363,238 +45665,68 @@
+@@ -102371,238 +45673,68 @@
@@ -106755,7 +106746,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102612,46 +45744,15 @@
+@@ -102620,46 +45752,15 @@
return 0;
}
_ACEOF
@@ -106806,7 +106797,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102669,65 +45770,32 @@
+@@ -102677,65 +45778,32 @@
return 0;
}
_ACEOF
@@ -106880,7 +106871,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. */
-@@ -102768,50 +45836,24 @@
+@@ -102776,50 +45844,24 @@
return 0;
}
_ACEOF
@@ -106937,7 +106928,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
BLKID_LIBS = ${BLKID_LIBS}
BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -102822,9 +45864,7 @@
+@@ -102830,9 +45872,7 @@
if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
@@ -106948,7 +106939,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102852,102 +45892,12 @@
+@@ -102860,102 +45900,12 @@
fi
@@ -107055,7 +107046,7 @@
_ACEOF
fi
-@@ -102957,151 +45907,12 @@
+@@ -102965,151 +45915,12 @@
###############################
# start SMB_EXT_LIB_PAM
# check for security/pam_appl.h and -lpam
@@ -107211,7 +107202,7 @@
_ACEOF
fi
-@@ -103110,23 +45921,17 @@
+@@ -103118,23 +45929,17 @@
@@ -107238,7 +107229,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -103144,54 +45949,28 @@
+@@ -103152,54 +45957,28 @@
return 0;
}
_ACEOF
@@ -107300,7 +107291,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -103206,7 +45985,6 @@
+@@ -103214,7 +45993,6 @@
fi
@@ -107308,7 +107299,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
-@@ -103232,23 +46010,17 @@
+@@ -103240,23 +46018,17 @@
# test for where we get crypt() from
@@ -107335,7 +107326,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -103266,54 +46038,28 @@
+@@ -103274,54 +46046,28 @@
return 0;
}
_ACEOF
@@ -107397,7 +107388,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
-@@ -103329,7 +46075,6 @@
+@@ -103337,7 +46083,6 @@
fi
@@ -107405,7 +107396,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
CRYPT_ENABLE = YES
"
-@@ -103346,102 +46091,12 @@
+@@ -103354,102 +46099,12 @@
@@ -107513,7 +107504,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -103450,151 +46105,12 @@
+@@ -103458,151 +46113,12 @@
done
@@ -107669,7 +107660,7 @@
_ACEOF
fi
-@@ -103603,23 +46119,17 @@
+@@ -103611,23 +46127,17 @@
@@ -107696,7 +107687,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -103637,54 +46147,28 @@
+@@ -103645,54 +46155,28 @@
return 0;
}
_ACEOF
@@ -107758,7 +107749,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSASL2 1
_ACEOF
-@@ -103700,7 +46184,6 @@
+@@ -103708,7 +46192,6 @@
fi
@@ -107766,7 +107757,7 @@
if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103746,312 +46229,88 @@
+@@ -103754,312 +46237,88 @@
ac_new_flags="$ac_new_flags$s$i";
else
ac_new_flags="$ac_new_flags$s$l $i";
@@ -108136,7 +108127,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -104062,41 +46321,18 @@
+@@ -104070,41 +46329,18 @@
return 0;
}
_ACEOF
@@ -108182,7 +108173,7 @@
fi
-@@ -104140,17 +46376,13 @@
+@@ -104148,17 +46384,13 @@
fi
@@ -108203,7 +108194,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -104161,56 +46393,29 @@
+@@ -104169,56 +46401,29 @@
return 0;
}
_ACEOF
@@ -108267,7 +108258,7 @@
/* end confdefs.h. */
#include <signal.h>
int
-@@ -104221,41 +46426,18 @@
+@@ -104229,41 +46434,18 @@
return 0;
}
_ACEOF
@@ -108313,7 +108304,7 @@
fi
-@@ -104279,151 +46461,12 @@
+@@ -104287,151 +46469,12 @@
fi
@@ -108470,7 +108461,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -104737,151 +46780,12 @@
+@@ -104745,151 +46788,12 @@
@@ -108626,7 +108617,7 @@
_ACEOF
fi
-@@ -104891,23 +46795,17 @@
+@@ -104899,23 +46803,17 @@
@@ -108653,7 +108644,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -104925,54 +46823,28 @@
+@@ -104933,54 +46831,28 @@
return 0;
}
_ACEOF
@@ -108715,7 +108706,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -104988,18 +46860,13 @@
+@@ -104996,18 +46868,13 @@
fi
@@ -108737,7 +108728,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -105017,40 +46884,19 @@
+@@ -105025,40 +46892,19 @@
return 0;
}
_ACEOF
@@ -108780,7 +108771,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -105072,7 +46918,7 @@
+@@ -105080,7 +46926,7 @@
# Check whether --enable-dmalloc was given.
@@ -108789,7 +108780,7 @@
enableval=$enable_dmalloc;
fi
-@@ -105080,14 +46926,10 @@
+@@ -105088,14 +46934,10 @@
if test "x$enable_dmalloc" = xyes
then
@@ -108806,7 +108797,7 @@
LIBS="$LIBS -ldmalloc"
fi
-@@ -105185,87 +47027,54 @@
+@@ -105193,87 +47035,54 @@
#################################################
# Display summary of libraries detected
@@ -108910,7 +108901,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
-@@ -105324,13 +47133,13 @@
+@@ -105332,13 +47141,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -108926,7 +108917,7 @@
esac ;;
esac
done
-@@ -105338,8 +47147,8 @@
+@@ -105346,8 +47155,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -108937,7 +108928,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -105362,11 +47171,11 @@
+@@ -105370,11 +47179,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" &&
@@ -108951,7 +108942,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -105386,8 +47195,8 @@
+@@ -105394,8 +47203,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.
@@ -108962,7 +108953,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -105411,9 +47220,10 @@
+@@ -105419,9 +47228,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -108975,7 +108966,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -105423,17 +47233,18 @@
+@@ -105431,17 +47241,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -109001,7 +108992,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -105441,23 +47252,15 @@
+@@ -105449,23 +47260,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -109030,7 +109021,7 @@
as_nl='
'
export as_nl
-@@ -105465,7 +47268,13 @@
+@@ -105473,7 +47276,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
@@ -109045,7 +109036,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -105476,7 +47285,7 @@
+@@ -105484,7 +47293,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -109054,7 +109045,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -105499,13 +47308,6 @@
+@@ -105507,13 +47316,6 @@
}
fi
@@ -109068,7 +109059,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -105515,15 +47317,15 @@
+@@ -105523,15 +47325,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -109087,7 +109078,7 @@
IFS=$as_save_IFS
;;
-@@ -105535,12 +47337,16 @@
+@@ -105543,12 +47345,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -109108,7 +109099,7 @@
done
PS1='$ '
PS2='> '
-@@ -105552,7 +47358,89 @@
+@@ -105560,7 +47366,89 @@
LANGUAGE=C
export LANGUAGE
@@ -109199,7 +109190,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -105566,8 +47454,12 @@
+@@ -105574,8 +47462,12 @@
as_basename=false
fi
@@ -109213,7 +109204,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -105587,76 +47479,25 @@
+@@ -105595,76 +47487,25 @@
}
s/.*/./; q'`
@@ -109301,7 +109292,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -105685,8 +47526,56 @@
+@@ -105693,8 +47534,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -109359,7 +109350,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -105705,10 +47594,10 @@
+@@ -105713,10 +47602,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -109372,7 +109363,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -105723,13 +47612,19 @@
+@@ -105731,13 +47620,19 @@
exec 6>&1
@@ -109394,7 +109385,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -105761,13 +47656,15 @@
+@@ -105769,13 +47664,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -109413,7 +109404,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -105786,16 +47683,17 @@
+@@ -105794,16 +47691,17 @@
Configuration commands:
$config_commands
@@ -109435,7 +109426,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -105830,6 +47728,8 @@
+@@ -105838,6 +47736,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -109444,7 +109435,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -105837,20 +47737,19 @@
+@@ -105845,20 +47745,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -109469,7 +109460,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -105858,11 +47757,10 @@
+@@ -105866,11 +47765,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -109484,7 +109475,7 @@
ac_need_defaults=false ;;
esac
-@@ -105955,9 +47853,7 @@
+@@ -105963,9 +47861,7 @@
"pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
"../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
@@ -109495,7 +109486,7 @@
esac
done
-@@ -105984,7 +47880,7 @@
+@@ -105992,7 +47888,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -109504,7 +109495,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -105995,11 +47891,7 @@
+@@ -106003,11 +47899,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -109517,7 +109508,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -106007,10 +47899,16 @@
+@@ -106015,10 +47907,16 @@
if test -n "$CONFIG_FILES"; then
@@ -109537,7 +109528,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -106024,24 +47922,18 @@
+@@ -106032,24 +47930,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -109565,7 +109556,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -106063,7 +47955,7 @@
+@@ -106071,7 +47963,7 @@
t delim
:nl
h
@@ -109574,7 +109565,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -106077,7 +47969,7 @@
+@@ -106085,7 +47977,7 @@
t nl
:delim
h
@@ -109583,7 +109574,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -106130,9 +48022,7 @@
+@@ -106138,9 +48030,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -109594,7 +109585,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -106173,9 +48063,7 @@
+@@ -106181,9 +48071,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -109605,7 +109596,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -106260,9 +48148,7 @@
+@@ -106268,9 +48156,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -109616,7 +109607,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -106275,9 +48161,7 @@
+@@ -106283,9 +48169,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -109627,7 +109618,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -106305,12 +48189,10 @@
+@@ -106313,12 +48197,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -109642,7 +109633,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -106321,7 +48203,7 @@
+@@ -106329,7 +48211,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -109651,7 +109642,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -106334,9 +48216,7 @@
+@@ -106342,9 +48224,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -109662,7 +109653,7 @@
esac
;;
esac
-@@ -106364,47 +48244,7 @@
+@@ -106372,47 +48252,7 @@
q
}
s/.*/./; q'`
@@ -109711,7 +109702,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -106456,7 +48296,6 @@
+@@ -106464,7 +48304,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=
@@ -109719,7 +109710,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -106466,12 +48305,11 @@
+@@ -106474,12 +48313,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -109734,7 +109725,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
-@@ -106481,7 +48319,7 @@
+@@ -106489,7 +48327,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -109743,7 +109734,7 @@
esac
_ACEOF
-@@ -106509,14 +48347,12 @@
+@@ -106517,14 +48355,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -109760,7 +109751,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;}
-@@ -106526,9 +48362,7 @@
+@@ -106534,9 +48370,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -109771,7 +109762,7 @@
;;
:H)
#
-@@ -106539,29 +48373,23 @@
+@@ -106547,29 +48381,23 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -109806,7 +109797,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -106587,15 +48415,12 @@
+@@ -106595,15 +48423,12 @@
done # for ac_tag
@@ -109824,7 +109815,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -106616,10 +48441,10 @@
+@@ -106624,10 +48449,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.
@@ -109837,7 +109828,7 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -106630,8 +48455,8 @@
+@@ -106638,8 +48463,8 @@
# Print very concise instructions on building/use
if test "x$enable_dmalloc" = xyes
then
More information about the Pkg-samba-maint
mailing list