[Pkg-samba-maint] r3422 - branches/samba/experimental/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Thu Apr 8 17:47:35 UTC 2010
Author: bubulle
Date: 2010-04-08 17:47:30 +0000 (Thu, 08 Apr 2010)
New Revision: 3422
Modified:
branches/samba/experimental/debian/patches/autoconf.patch
branches/samba/experimental/debian/patches/documentation.patch
Log:
Adapt patches for 3.5.2
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2010-04-07 20:24:28 UTC (rev 3421)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2010-04-08 17:47:30 UTC (rev 3422)
@@ -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,14 +8714,7 @@
-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"
@@ -8729,26 +8722,42 @@
+# by default.
+if test "x$debug" = "xyes" ; then
+ CFLAGS="${CFLAGS} -g"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+if test "x$CFLAGS" = x; then
+ CFLAGS="-O"
fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++ enableval=$enable_socket_wrapper;
++fi
+
+
+-fi
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++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
-+# Check whether --enable-socket-wrapper was given.
-+if test "${enable_socket_wrapper+set}" = set; then :
-+ enableval=$enable_socket_wrapper;
- fi
+-fi
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
-{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
-$as_echo_n "checking for uint16_t... " >&6; }
@@ -8828,30 +8837,27 @@
-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
-+DEFAULT_TEST_OPTIONS=
-+HAVE_SOCKET_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+ enable_socket_wrapper=yes
++ # this is only used for samba3
++ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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
-+ # this is only used for samba3
-+ SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
++
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++ enableval=$enable_nss_wrapper;
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
-$as_echo "$ac_cv_type_uint16_t" >&6; }
@@ -8863,8 +8869,13 @@
-#define uint16_t unsigned short
-_ACEOF
--fi
++HAVE_NSS_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++ enable_nss_wrapper=yes
+ fi
++if eval "test x$enable_nss_wrapper = xyes"; then
-if test $ac_cv_sizeof_int -eq 4 ; then
-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
@@ -8945,26 +8956,25 @@
-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
-+# Check whether --enable-nss-wrapper was given.
-+if test "${enable_nss_wrapper+set}" = set; then :
-+ enableval=$enable_nss_wrapper;
++ HAVE_NSS_WRAPPER=yes
++
++ # this is only used for samba3
++ NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $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
-+if eval "test x$developer = xyes"; then
-+ enable_nss_wrapper=yes
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
-$as_echo "$ac_cv_type_int32_t" >&6; }
-if test "x$ac_cv_type_int32_t" = x""yes; then
@@ -8974,10 +8984,8 @@
-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; }
@@ -9057,11 +9065,20 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ HAVE_NSS_WRAPPER=yes
++SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
++SWAT_INSTALL_TARGETS=installswat
++
++# Check whether --enable-swat was given.
++if test "${enable_swat+set}" = set; then :
++ enableval=$enable_swat;
++ case "$enable_swat" in
++ no)
++ SWAT_SBIN_TARGETS=''
++ SWAT_INSTALL_TARGETS=''
++ ;;
++ esac
- ac_cv_type_uint32_t=yes
-+ # 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
@@ -9090,8 +9107,17 @@
-{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
-$as_echo_n "checking for int32_t... " >&6; }
-if test "${ac_cv_type_int32_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++# Probe the gcc version for extra CFLAGS. We always stash these in
++# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
++# Makefile edit, avoiding the need to re-run configure.
++if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
++ DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
++ # Add -Wdeclaration-after-statement if compiler supports it
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
++$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
++if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_int32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -9132,7 +9158,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -Wdeclaration-after-statement";
++ export CFLAGS;
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
++ export CPPFLAGS;
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
++ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_Wdeclaration_after_statement=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -9142,7 +9183,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9162,32 +9208,37 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Wdeclaration_after_statement=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+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
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
@@ -9196,26 +9247,37 @@
-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
-+# 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
+- $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
else
- ac_cv_type_uint32_t=no
-cat >conftest.$ac_ext <<_ACEOF
@@ -9223,7 +9285,8 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -9233,7 +9296,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9290,23 +9358,12 @@
-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
-+ 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
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -34964,7 +35021,9 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_Werror_implicit_function_declaration=yes
+ else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -34981,10 +35040,13 @@
- else
- ac_cv_sizeof_short=0
- fi
--fi
++ samba_cv_HAVE_Werror_implicit_function_declaration=no
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
@@ -35062,7 +35124,7 @@
- }
- return !cs[0] && !zero.x;
-#endif
--
+
- ;
- return 0;
-}
@@ -35089,60 +35151,49 @@
-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;
- ac_cv_c_const=no
-+ 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
--
+-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
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-+
++ # 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:${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
-+ 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
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
@@ -35150,33 +35201,14 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+ 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. */
+-/* 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
-
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -35196,56 +35228,14 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_inline=$ac_kw
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_Werror_implicit_function_declaration=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ samba_cv_HAVE_Werror_implicit_function_declaration=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+ CFLAGS="$old_CFLAGS";
-+ old_CFLAGS="";
-+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
-+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
-+ export LDFLAGS;
-
-
- 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
-+ # 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
@@ -35253,13 +35243,32 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
--case $ac_cv_c_inline in
-- inline | yes) ;;
+-fi
+$as_echo "#define WITH_PROFILE 1" >>confdefs.h
-+
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- test "$ac_cv_c_inline" != no && break
+-done
+ samba_cv_WITH_PROFILE=yes
+ ;;
- *)
++ *)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ samba_cv_WITH_PROFILE=no
++ ;;
++ esac
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
+
+
+-case $ac_cv_c_inline in
+- inline | yes) ;;
+- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
@@ -35269,25 +35278,14 @@
-#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
-+ esac
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
++merged_build_possible=yes
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
-+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.
@@ -36491,22 +36489,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+ 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. */
+-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
@@ -36516,12 +36499,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36541,55 +36519,16 @@
- 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;
- 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
+- ac_cv_type_size_t=yes
+-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--$as_echo "$ac_cv_type_size_t" >&6; }
--if test "x$ac_cv_type_size_t" = x""yes; then
-- :
-+
+ old_CFLAGS="$CFLAGS";
-+ CFLAGS="$CFLAGS -w2";
++ CFLAGS="$CFLAGS -Werror";
+ export CFLAGS;
+ old_CPPFLAGS="$CPPFLAGS";
+ CPPFLAGS="$CPPFLAGS";
@@ -36598,31 +36537,38 @@
+ LDFLAGS="$LDFLAGS";
+ export LDFLAGS;
+ if test "$cross_compiling" = yes; then :
-+ samba_cv_HAVE_w2=cross
++ samba_cv_HAVE_Werror=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_w2=yes
++ samba_cv_HAVE_Werror=yes
+else
-+ samba_cv_HAVE_w2=no
-+fi
++ samba_cv_HAVE_Werror=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
+- :
+-else
--{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
--$as_echo_n "checking for pid_t... " >&6; }
--if test "${ac_cv_type_pid_t+set}" = set; then
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned int
+-_ACEOF
+ CFLAGS="$old_CFLAGS";
+ old_CFLAGS="";
+ export CFLAGS;
@@ -36632,17 +36578,17 @@
+ LDFLAGS="$old_LDFLAGS";
+ old_LDFLAGS="";
+ export LDFLAGS;
-+
-+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
+
+ fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+-$as_echo_n "checking for pid_t... " >&6; }
+-if test "${ac_cv_type_pid_t+set}" = set; then
+- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
++$as_echo "$samba_cv_HAVE_Werror" >&6; }
++if test x"$samba_cv_HAVE_Werror" = x"yes"; then
++ Werror_FLAGS="-Werror"
else
- ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
@@ -36684,22 +36630,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 ()
@@ -36709,12 +36640,7 @@
- ;
- return 0;
-}
-+
-+ int main(void)
-+ {
-+ return 0;
-+ }
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36734,67 +36660,80 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+if ac_fn_c_try_run "$LINENO"; then :
-+ samba_cv_HAVE_errwarn=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
++$as_echo_n "checking that the C compiler understands -w2... " >&6; }
++if test "${samba_cv_HAVE_w2+set}" = set; then :
++ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_type_pid_t=yes
-+ 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
+-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="";
++ old_CFLAGS="$CFLAGS";
++ CFLAGS="$CFLAGS -w2";
+ export CFLAGS;
-+ CPPFLAGS="$old_CPPFLAGS";
-+ old_CPPFLAGS="";
++ old_CPPFLAGS="$CPPFLAGS";
++ CPPFLAGS="$CPPFLAGS";
+ export CPPFLAGS;
-+ LDFLAGS="$old_LDFLAGS";
-+ old_LDFLAGS="";
++ old_LDFLAGS="$LDFLAGS";
++ LDFLAGS="$LDFLAGS";
+ export LDFLAGS;
++ if test "$cross_compiling" = yes; then :
++ samba_cv_HAVE_w2=cross
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++ int main(void)
++ {
++ return 0;
++ }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_w2=yes
++else
++ samba_cv_HAVE_w2=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $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"
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
- :
-else
--
+
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
--
- 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
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
+ fi
+-
-{ $as_echo "$as_me:$LINENO: 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 "$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
+- $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"
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -36832,7 +36771,11 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=yes
--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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -36841,7 +36784,21 @@
-_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 ()
@@ -36852,7 +36809,12 @@
- ;
- return 0;
-}
--_ACEOF
++
++ int main(void)
++ {
++ return 0;
++ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -36872,37 +36834,73 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_rdev=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; }
++if ac_fn_c_try_run "$LINENO"; then :
++ samba_cv_HAVE_errwarn=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ samba_cv_HAVE_errwarn=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++ CFLAGS="$old_CFLAGS";
++ old_CFLAGS="";
++ export CFLAGS;
++ CPPFLAGS="$old_CPPFLAGS";
++ old_CPPFLAGS="";
++ export CPPFLAGS;
++ LDFLAGS="$old_LDFLAGS";
++ old_LDFLAGS="";
++ export LDFLAGS;
+
- ac_cv_member_struct_stat_st_rdev=no
--fi
+ fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
++$as_echo "$samba_cv_HAVE_errwarn" >&6; }
++if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
++ Werror_FLAGS="-errwarn=%all"
++fi
+ fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_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;
@@ -37253,14 +37251,6 @@
- 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
@@ -37268,43 +37258,70 @@
- $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
--
--fi
--
++if test x"$c99_init" = x"yes"; then
++ saved_CFLAGS=""
++else
++ CFLAGS="$saved_CFLAGS"
++ saved_CFLAGS=""
++ as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
+ fi
+
+
-############################################
-# for cups support we need libcups, and a handful of header files
--
++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;
-+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
+-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 x"$c99_init" = x"yes"; then
-+ saved_CFLAGS=""
++UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
++$as_echo_n "checking uname -m... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
++$as_echo "${UNAME_M}" >&6; }
-if test x$enable_cups != xno; then
- # Extract the first word of "cups-config", so it can be a program name with args.
@@ -37333,44 +37350,54 @@
-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; }
+
- ;;
--esac
++UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
++$as_echo_n "checking uname -i... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
++$as_echo "${UNAME_I}" >&6; }
++
++ case "$host_os" in
++ *irix6*)
++ #TODO add to libreplace
++ if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
++ CFLAGS="$CFLAGS -diag_error 1035"
++ CFLAGS="$CFLAGS -woff 1209,1174,3201"
++ fi
++ ;;
+ esac
-fi
-CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
-if test -n "$CUPS_CONFIG"; then
- { $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; }
-+ CFLAGS="$saved_CFLAGS"
-+ saved_CFLAGS=""
-+ as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
- fi
+-fi
++DYNEXP=
-+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; }
++LDSHFLAGS_Z_DEFS=
- 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`
@@ -37419,28 +37446,31 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+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; }
++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 vfs_scannedonly"
- ac_header_compiler=no
--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; }
++if test "x$developer" = xyes; then
++ default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
++ default_shared_modules="$default_shared_modules charset_weird perfcount_test"
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+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; }
++#
++# Config CPPFLAG settings for strange OS's that must be set
++# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
++# case statement; its first reference must be unconditional.
++#
++case "$host_os" in
++ *hpux*)
++#
++# Defines needed for HPUX support.
++# HPUX has bigcrypt but (sometimes?) doesn't use it for
++# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
++#
++ case `uname -r` in
++ *9*|*10*|*11)
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -37457,15 +37487,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ 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
-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
@@ -37482,14 +37504,24 @@
-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; }
-+DYNEXP=
++#
++# CRAY Unicos has broken const handling
++ *unicos*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
++$as_echo "disabling const" >&6; }
++ CPPFLAGS="$CPPFLAGS -Dconst="
++ ;;
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -37532,7 +37564,14 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+LDSHFLAGS_Z_DEFS=
++#
++# AIX4.x doesn't even admit to having large
++# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
++#
++ *aix4*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -37541,100 +37580,150 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-+LDSHFLAGS_Z_NODEFS=
++$as_echo "#define _LARGE_FILES 1" >>confdefs.h
-fi
++ ;;
++#
++# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
++# to the existance of large files..
++# Note that -D_LARGEFILE64_SOURCE is different from the Sun
++# recommendations on large file support, however it makes the
++# compile work using gcc 2.7 and 2.8, whereas using the Sun
++# recommendation makes the compile fail on gcc2.7. JRA.
++#
++# Solaris uses SYSV printing. Make sure to set that here. --jerry
++#
++ *solaris*)
-done
-+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"
++$as_echo "#define SYSV 1" >>confdefs.h
- if test x"$ac_cv_header_cups_cups_h" = xyes -a \
- x"$ac_cv_header_cups_language_h" = xyes; then
-+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 vfs_scannedonly"
++ case `uname -r` in
++ 5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
++$as_echo "no large file support" >&6; }
++ ;;
++ 5.*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++ if test "$ac_cv_c_compiler_gnu" = yes; then
++ ${CC-cc} -v >conftest.c 2>&1
++ ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
++ rm -fr conftest.c
++ case "$ac_cv_gcc_compiler_version_number" in
++ *"gcc version 2.6"*|*"gcc version 2.7"*)
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
++ LDFLAGS="$LDFLAGS -lthread"
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CUPS 1
-_ACEOF
-+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
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- samba_cv_HAVE_CUPS=yes
-+#
-+# 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)
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
-+$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-+ ;;
-+ esac
-+ ;;
-ac_check_lib_ext_save_LIBS=$LIBS
-LIBS="-lcups $PRINT_LIBS $LIBS"
-+#
-+# 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="
-+ ;;
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-+#
-+# 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"
++ ;;
++ esac
++ else
++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++ LDFLAGS="$LDFLAGS -lthread"
-+$as_echo "#define _LARGE_FILES 1" >>confdefs.h
++$as_echo "#define _LARGEFILE64_SOURCE 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
--else
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
++
++ fi
++ ;;
++ esac
++ ;;
++#
++# IRIX uses SYSV printing. Make sure to set that here
++#
++ *irix*)
++
++$as_echo "#define SYSV 1" >>confdefs.h
++
++ ;;
++ *freebsd*|*dragonfly*)
++
++$as_echo "#define FREEBSD 1" >>confdefs.h
++
++ ;;
++#
++# VOS may need to have POSIX support and System V compatibility enabled.
++#
++ *vos*)
++ case "$CPPFLAGS" in
++ *-D_POSIX_C_SOURCE*)
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
++
++$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
++
++ ;;
++ esac
++ case "$CPPFLAGS" in
++ *-D_SYSV*|*-D_SVID_SOURCE*)
++ ;;
++ *)
++ CPPFLAGS="$CPPFLAGS -D_SYSV"
++
++$as_echo "#define _SYSV 1" >>confdefs.h
++
++ esac
++ ;;
++#
++# Tests needed for SINIX large file support.
++#
++ *sysv4*)
++ if test $host = mips-sni-sysv4 ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ SINIX_LFS_SUPPORT=cross
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+$as_echo "#define SYSV 1" >>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 <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
+ #endif
-char httpConnectEncrypt ();
-int
-main ()
@@ -37642,7 +37731,7 @@
-return httpConnectEncrypt ();
- ;
- return 0;
--}
+ }
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -37667,87 +37756,63 @@
- }; then
- ac_cv_lib_ext_cups_httpConnectEncrypt=yes;
- ac_cv_lib_ext_cups=yes
--else
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ SINIX_LFS_SUPPORT=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ 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
-+ ;;
-+ *)
-+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+ LDFLAGS="$LDFLAGS -lthread"
-
--fi
+-
++ SINIX_LFS_SUPPORT=no
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
-$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
- if test $ac_cv_lib_ext_cups_httpConnectEncrypt = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_HTTPCONNECTENCRYPT 1
-_ACEOF
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+-
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
--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
-+ ;;
-+ *freebsd*|*dragonfly*)
++ 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
++ ;;
- else
- { $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
@@ -37756,7 +37821,10 @@
- LDFLAGS=$ac_save_LDFLAGS
- PRINT_LIBS=$ac_save_PRINT_LIBS
- fi
-+$as_echo "#define FREEBSD 1" >>confdefs.h
++# Systems with LFS support.
++#
++ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- elif test x"$enable_cups" = x"yes"; then
- { { $as_echo "$as_me:$LINENO: error: Cups support required but cups-config not located. Make sure cups-devel related files are installed." >&5
@@ -37764,77 +37832,30 @@
- { (exit 1); exit 1; }; }
- fi
-fi
-+ ;;
-+#
-+# 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 _LARGEFILE64_SOURCE 1" >>confdefs.h
-# Check whether --enable-iprint was given.
-if test "${enable_iprint+set}" = set; then
- enableval=$enable_iprint;
-fi
-+$as_echo "#define _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
++$as_echo "#define _FILE_OFFSET_BITS 64" >>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
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
-+}
- _ACEOF
--
+-_ACEOF
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
- elif test x"$enable_iprint" = x"yes"; then
- { { $as_echo "$as_me:$LINENO: error: iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled." >&5
-$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
-+if ac_fn_c_try_run "$LINENO"; then :
-+ SINIX_LFS_SUPPORT=yes
-+else
-+ SINIX_LFS_SUPPORT=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
++ ;;
-############################################
-# check if the compiler will optimize out function calls
@@ -37842,48 +37863,73 @@
-$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
-if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$SINIX_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-
++# 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 _LARGEFILE64_SOURCE 1" >>confdefs.h
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-+ 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
-+ ;;
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <string.h>
++#include <stdlib.h>
++main() {
++#if _LFS64_LARGEFILE == 1
++ struct utsname uts;
++ char *release;
++ int major, minor;
- if (0) {
- this_function_does_not_exist();
- } else {
- return 1;
- }
-+# Systems with LFS support.
-+#
-+ gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++ /* Ensure this is glibc 2.2 or higher */
++#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
++ int libc_major = __GLIBC__;
++ int libc_minor = __GLIBC_MINOR__;
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++ if (libc_major < 2)
++ exit(1);
++ if (libc_minor < 2)
++ exit(1);
++#endif
- ;
- return 0;
--}
--_ACEOF
++ /* 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 conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -37906,18 +37952,22 @@
- $as_test_x conftest$ac_exeext
- }; then
- samba_cv_optimize_out_funcation_calls=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ LINUX_LFS_SUPPORT=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- samba_cv_optimize_out_funcation_calls=no
--fi
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-
++ LINUX_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
-{ $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
@@ -37925,10 +37975,12 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
-_ACEOF
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$LINUX_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-fi
-+ ;;
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-#############################################
-# check for fd passing struct via msg_control
@@ -37936,41 +37988,24 @@
-$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
-+# 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
+
- 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 _FILE_OFFSET_BITS 64" >>confdefs.h
-#include <sys/types.h>
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <string.h>
- #include <stdlib.h>
+-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-int
-main ()
-{
-+main() {
-+#if _LFS64_LARGEFILE == 1
-+ struct utsname uts;
-+ char *release;
-+ int major, minor;
- struct msghdr msg;
- union {
@@ -37979,35 +38014,12 @@
- } control_un;
- msg.msg_control = control_un.control;
- msg.msg_controllen = sizeof(control_un.control);
-+ /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+ int libc_major = __GLIBC__;
-+ int libc_minor = __GLIBC_MINOR__;
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- ;
- return 0;
-+ if (libc_major < 2)
-+ exit(1);
-+ if (libc_minor < 2)
-+ exit(1);
-+#endif
-+
-+ /* Ensure this is kernel 2.4 or higher */
-+
-+ uname(&uts);
-+ release = strdup(uts.release);
-+ major = atoi(strsep(&release, "."));
-+ minor = atoi(strsep(&release, "."));
-+
-+ if (major > 2 || (major == 2 && minor > 3))
-+ exit(0);
-+ exit(1);
-+#else
-+ exit(1);
-+#endif
- }
-+
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38027,32 +38039,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_control=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ LINUX_LFS_SUPPORT=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
++$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++ ;;
+
- samba_cv_msghdr_msg_control=no
-+ LINUX_LFS_SUPPORT=no
- fi
--
+-fi
++#
++# MacOS X is the *only* system that uses compose character in utf8. This
++# is so horribly broken....
++#
++ *darwin*)
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
-$as_echo "$samba_cv_msghdr_msg_control" >&6; }
-if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
--
++$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_CONTROL 1
-_ACEOF
-fi
-+ CPPFLAGS="$old_CPPFLAGS"
-+ if test x$LINUX_LFS_SUPPORT = xyes ; then
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++# Add a system specific charset module.
++ default_shared_modules="$default_shared_modules charset_macosxfs"
-#############################################
-# check for fd passing struct via msg_acctrights
@@ -38060,15 +38076,23 @@
-$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
-if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-
++ ;;
++ *hurd*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++ old_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++ if test "$cross_compiling" = yes; then :
++ GLIBC_LFS_SUPPORT=cross
+ else
+-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <sys/types.h>
-#include <stdlib.h>
@@ -38078,17 +38102,23 @@
-int
-main ()
-{
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-
+-
- struct msghdr msg;
- int fd;
- msg.msg_acctrights = (caddr_t) &fd;
- msg.msg_acctrightslen = sizeof(fd);
-
+-
- ;
- return 0;
--}
--_ACEOF
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -38108,38 +38138,34 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_msghdr_msg_acctrights=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ GLIBC_LFS_SUPPORT=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
+-
- samba_cv_msghdr_msg_acctrights=no
--fi
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
-+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
-+ ;;
-
++ GLIBC_LFS_SUPPORT=no
+ fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5
-$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; }
-if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+ *darwin*)
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1
-_ACEOF
-+$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
-fi
++ CPPFLAGS="$old_CPPFLAGS"
++ if test x$GLIBC_LFS_SUPPORT = xyes ; then
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+# Add a system specific charset module.
-+ default_shared_modules="$default_shared_modules charset_macosxfs"
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-for ac_func in dirfd
-do
@@ -38148,43 +38174,38 @@
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+ ;;
-+ *hurd*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+ old_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+ if test "$cross_compiling" = yes; then :
-+ GLIBC_LFS_SUPPORT=cross
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* 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>
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
- #else
+-#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. */
@@ -38197,23 +38218,23 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+exit(1);
- #endif
--
+-#endif
++ ;;
+
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) 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
@@ -38230,22 +38251,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+ GLIBC_LFS_SUPPORT=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-+ GLIBC_LFS_SUPPORT=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 *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam 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
@@ -38256,17 +38272,15 @@
- 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
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
-{ $as_echo "$as_me:$LINENO: checking for struct sigevent type" >&5
-$as_echo_n "checking for struct sigevent type... " >&6; }
@@ -38280,18 +38294,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-+
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
-+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
-+ ;;
-+ *qnx*)
-+ CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-+
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
-+
-+ ;;
++echo "LIBREPLACE_BROKEN_CHECKS: START"
-#include <sys/types.h>
-#if STDC_HEADERS
@@ -38312,7 +38315,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
@@ -38329,36 +38332,30 @@
-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; }
@@ -38372,6 +38369,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <signal.h>
++LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
-int
-main ()
@@ -38402,21 +38400,19 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+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>
@@ -38613,13 +38609,11 @@
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define mode_t int
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+-
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
@@ -38635,11 +38629,7 @@
-# include <time.h>
-# endif
-#endif
-+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 ()
-{
@@ -38667,31 +38657,30 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- samba_cv_struct_timespec=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- samba_cv_struct_timespec=no
--fi
+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
++#define mode_t int
+_ACEOF
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- samba_cv_struct_timespec=no
fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_timespec" >&5
-$as_echo "$samba_cv_struct_timespec" >&6; }
-if test x"$samba_cv_struct_timespec" = x"yes"; then
++ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
++if test "x$ac_cv_type_off_t" = x""yes; then :
++
++else
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_TIMESPEC 1
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
-+
-+else
-+
+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
++#define off_t long int
_ACEOF
fi
@@ -38703,8 +38692,8 @@
-if test "${samba_cv_have_setresuid+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-+if test "x$ac_cv_type_pid_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
- if test "$cross_compiling" = yes; then
- samba_cv_have_setresuid=cross
@@ -38719,7 +38708,7 @@
-main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
+
+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
++#define size_t unsigned int
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -38756,15 +38745,14 @@
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
++if test "x$ac_cv_type_pid_t" = x""yes; then :
+
++else
++
+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
++#define pid_t int
+_ACEOF
-+
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
@@ -38773,16 +38761,16 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SETRESUID 1
++ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
+
-+ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ino_t" = x""yes; then :
-+
-+else
-+
+cat >>confdefs.h <<_ACEOF
-+#define ino_t unsigned
++#define HAVE_STRUCT_STAT_ST_RDEV 1
_ACEOF
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
++
fi
-# Do the same check for setresguid...
@@ -38792,11 +38780,12 @@
-if test "${samba_cv_have_setresgid+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-+if test "x$ac_cv_type_loff_t" = x""yes; then :
- if test "$cross_compiling" = yes; then
- samba_cv_have_setresgid=cross
++ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
++if test "x$ac_cv_type_ino_t" = x""yes; then :
++
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -38809,7 +38798,7 @@
-main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
+
+cat >>confdefs.h <<_ACEOF
-+#define loff_t off_t
++#define ino_t unsigned
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -38846,17 +38835,27 @@
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-+ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
-+if test "x$ac_cv_type_offset_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++if test "x$ac_cv_type_loff_t" = x""yes; then :
++
++else
++
++cat >>confdefs.h <<_ACEOF
++#define loff_t off_t
++_ACEOF
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresgid" >&5
-$as_echo "$samba_cv_have_setresgid" >&6; }
-if test x"$samba_cv_have_setresgid" = x"yes"; then
-+else
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SETRESGID 1
++ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
++if test "x$ac_cv_type_offset_t" = x""yes; then :
++
++else
++
+cat >>confdefs.h <<_ACEOF
+#define offset_t loff_t
_ACEOF
@@ -38934,50 +38933,28 @@
$as_echo "$ac_cv_func_memcmp_working" >&6; }
test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
*" memcmp.$ac_objext "* ) ;;
-@@ -37997,317 +8456,154 @@
+@@ -37997,166 +8456,26 @@
-###############################################
-# Readline included by default unless explicitly asked not to
-test "${with_readline+set}" != "set" && with_readline=yes
-+for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
+-
-# test for where we get readline() from
-{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5
-$as_echo_n "checking whether to use readline... " >&6; }
-+fi
-+done
-
+-
-# Check whether --with-readline was given.
-if test "${with_readline+set}" = set; then
- withval=$with_readline; case "$with_readline" in
- yes)
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-+for ac_header in stdbool.h stdint.h sys/select.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
-+done
-
+-
+-
+-
+-
-for ac_header in readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39003,15 +38980,7 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+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
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39034,20 +39003,14 @@
-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; }
@@ -39058,7 +39021,15 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39077,19 +39048,18 @@
- 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: )
@@ -39124,33 +39094,32 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+
-+ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdbool_h" = x""yes; then :
-+ ac_config_commands="$ac_config_commands rm-stdbool.h"
-+
- else
+-else
- 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
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++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 +8484,12 @@
- fi
+ done
--done
-
-
+-
-for ac_header in readline/history.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39159,19 +39128,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
-+
-+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
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -39186,10 +39143,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
@@ -39214,22 +39168,14 @@
-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; }
@@ -39238,20 +39184,9 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-+$as_echo_n "checking for working mmap... " >&6; }
-+if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
-+ $as_echo_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. */
+-/* end confdefs.h. */
-#include <$ac_header>
-+#include "$libreplacedir/test/shared_mmap.c"
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39270,28 +39205,17 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_MMAP=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_HAVE_MMAP=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-
+-
- ac_header_preproc=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5
-+$as_echo "$libreplace_cv_HAVE_MMAP" >&6; }
-+if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#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: )
@@ -39328,31 +39252,17 @@
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+
-+
-+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
+-
+-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+done
-+
-+for ac_header in sys/time.h time.h
++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"
@@ -39361,34 +39271,15 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -38316,475 +8612,274 @@
-
+@@ -38317,474 +8499,97 @@
done
-+for ac_header in stdarg.h vararg.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+fi
++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"
-+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`
@@ -39397,44 +39288,24 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+
-+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
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+
-+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
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -39457,47 +39328,26 @@
-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_config_commands="$ac_config_commands mk-stdint.h"
-# 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
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39522,21 +39372,11 @@
- ac_header_preproc=no
fi
-+done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+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: )
@@ -39573,54 +39413,27 @@
- $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
-+done
-+
-+for ac_func in isatty chown lchown link readlink symlink realpath
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
- for termlib in ncurses curses termcap terminfo termlib tinfo; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+fi
-+done
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
-+$as_echo_n "checking for setresuid declaration... " >&6; }
-+if test "${ac_cv_have_setresuid_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l${termlib} $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -39628,28 +39441,10 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+#include <unistd.h>
-+int
-+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
+-/* end confdefs.h. */
++ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdbool_h" = x""yes; then :
++ ac_config_commands="$ac_config_commands rm-stdbool.h"
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -39658,29 +39453,14 @@
-extern "C"
-#endif
-char tgetent ();
-+$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
+-main ()
+-{
-return tgetent ();
-+int i = (int)setresgid
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -39703,24 +39483,13 @@
- $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_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
++ ac_config_commands="$ac_config_commands mk-stdbool.h"
- eval "$as_ac_Lib=no"
-fi
-+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -39735,17 +39504,14 @@
- $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 "$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
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $TERMLIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -39762,18 +39528,14 @@
-extern "C"
-#endif
-char rl_callback_handler_install ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <errno.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-return rl_callback_handler_install ();
-+int i = (int)errno
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -39799,10 +39561,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
@@ -39812,24 +39574,25 @@
-$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
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_errno_decl=yes
- else
+-else
- TERMLIBS=
-+ ac_cv_have_errno_decl=no
+-fi
++$as_echo "#define HAVE_BOOL 1" >>confdefs.h
+
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
-
@@ -39841,21 +39604,28 @@
- *)
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
--
+
- # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
- # alternate readline path
- _ldflags=${LDFLAGS}
- _cppflags=${CPPFLAGS}
--
++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
++$ac_includes_default
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#endif
+
- # Add additional search path
- LDFLAGS="-L$with_readline/lib $LDFLAGS"
- CPPFLAGS="-I$with_readline/include $CPPFLAGS"
--
-+$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
++"
++if test "x$ac_cv_type__Bool" = x""yes; then :
-+ fi
++$as_echo "#define HAVE__Bool 1" >>confdefs.h
++fi
+
-for ac_header in readline.h history.h readline/readline.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39863,9 +39633,9 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
-+$as_echo_n "checking for secure mkstemp... " >&6; }
-+if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -39924,25 +39694,12 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=cross
++ libreplace_cv_HAVE_MMAP=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <$ac_header>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+main() {
-+ struct stat st;
-+ char tpl[20]="/tmp/test.XXXXXX";
-+ int fd = mkstemp(tpl);
-+ if (fd == -1) exit(1);
-+ unlink(tpl);
-+ if (fstat(fd, &st) != 0) exit(1);
-+ if ((st.st_mode & 0777) != 0600) exit(1);
-+ exit(0);
-+}
++#include "$libreplacedir/test/shared_mmap.c"
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -39963,11 +39720,11 @@
- }; then
- ac_header_preproc=yes
+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=yes
++ libreplace_cv_HAVE_MMAP=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_HAVE_SECURE_MKSTEMP=no
++ 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
@@ -39975,14 +39732,14 @@
- 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
++{ $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_SECURE_MKSTEMP 1" >>confdefs.h
++$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
@@ -40030,7 +39787,8 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_header in stdio.h strings.h
++
++for ac_header in 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"
@@ -40039,7 +39797,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -38793,1135 +8888,564 @@
+@@ -38793,149 +8598,40 @@
done
@@ -40057,10 +39815,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40072,11 +39827,14 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+ ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_SNPRINTF $ac_have_decl
++for ac_header in sys/time.h time.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -40097,21 +39855,18 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
-+ ac_have_decl=0
fi
-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; }
@@ -40122,8 +39877,14 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VSNPRINTF $ac_have_decl
++for ac_header in stdarg.h vararg.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -40143,15 +39904,11 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_preproc=no
-+ ac_have_decl=0
fi
-rm -f conftest.err conftest.$ac_ext
@@ -40192,47 +39949,44 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ASPRINTF $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
-+ ac_have_decl=1
- else
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ ac_have_decl=0
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++done
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_VASPRINTF $ac_have_decl
-+_ACEOF
-+
-+for ac_func in snprintf vsnprintf asprintf vasprintf
++for ac_header in sys/mount.h mntent.h
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+@@ -38944,1149 +8640,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`
@@ -40240,16 +39994,13 @@
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
-+$as_echo_n "checking for C99 vsnprintf... " >&6; }
-+if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40261,7 +40012,13 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++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
@@ -40281,62 +40038,49 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+
-+if test "$cross_compiling" = yes; then :
-+ libreplace_cv_HAVE_C99_VSNPRINTF=cross
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
- ac_header_compiler=no
--fi
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+void foo(const char *format, ...) {
-+ va_list ap;
-+ int len;
-+ char buf[20];
-+ long long l = 1234567890;
-+ l *= 100;
+ 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; }
-+ va_start(ap, format);
-+ len = vsnprintf(buf, 0, format, ap);
-+ va_end(ap);
-+ if (len != 5) exit(1);
-+
-+ va_start(ap, format);
-+ len = vsnprintf(0, 0, format, ap);
-+ va_end(ap);
-+ if (len != 5) exit(2);
-+
-+ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
-+
-+ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
-+ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
-+ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
-+ if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
-+
-+ exit(0);
-+}
-+main() { foo("hello"); }
++done
-# 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>
++
++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
@@ -40356,27 +40100,26 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_HAVE_C99_VSNPRINTF=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_HAVE_C99_VSNPRINTF=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- ac_header_preproc=no
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
-+$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
-+if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
++done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
++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
@@ -40419,23 +40162,47 @@
- $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; do
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
-+$as_echo_n "checking for va_copy... " >&6; }
-+if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
++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
@@ -40454,15 +40221,14 @@
-extern "C"
-#endif
-char tgetent ();
-+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 tgetent ();
-+va_copy(ap1,ap2);
++int i = (int)setresuid
;
return 0;
}
@@ -40489,22 +40255,20 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE_VA_COPY=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresuid_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-+ libreplace_cv_HAVE_VA_COPY=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++ ac_cv_have_setresuid_decl=no
fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
@@ -40514,22 +40278,24 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- TERMLIBS="-l${termlib}"; break
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5
-+$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; }
-+if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
-+
-+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
-+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5
++$as_echo "$ac_cv_have_setresuid_decl" >&6; }
++ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then
- done
- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
-+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 "#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
- ac_check_lib_save_LIBS=$LIBS
@@ -40548,15 +40314,14 @@
-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 <stdarg.h>
-+va_list ap1,ap2;
++#include <unistd.h>
int
main ()
{
-return rl_callback_handler_install ();
-+__va_copy(ap1,ap2);
++int i = (int)setresgid
;
return 0;
}
@@ -40583,23 +40348,18 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_readline_rl_callback_handler_install=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ libreplace_cv_HAVE___VA_COPY=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_readline_rl_callback_handler_install=no
-+ libreplace_cv_HAVE___VA_COPY=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then
@@ -40607,72 +40367,51 @@
- 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___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___VA_COPY 1" >>confdefs.h
-
+-
- break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setresgid_decl=yes
+ else
- TERMLIBS= CPPFLAGS=$_cppflags
- fi
+-fi
-
++ ac_cv_have_setresgid_decl=no
fi
-
+-
-done
-
-
- LDFLAGS=$_ldflags
- ;;
- esac
-+{ $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
+-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+printf("%s\n", __FUNCTION__);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_FUNCTION_MACRO=yes
-+else
-+ libreplace_cv_HAVE_FUNCTION_MACRO=no
- fi
+-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5
-+$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; }
-+if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
+ 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_FUNCTION_MACRO 1" >>confdefs.h
++$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
--
--
++ fi
+
+
-# The readline API changed slightly from readline3 to readline4, so
-# code will generate warnings on one of them unless we have a few
-# special cases.
-{ $as_echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
-$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
-+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 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
@@ -40693,12 +40432,12 @@
-char rl_completion_matches ();
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <stdio.h>
++#include <errno.h>
int
main ()
{
-return rl_completion_matches ();
-+printf("%s\n", __func__);
++int i = (int)errno
;
return 0;
}
@@ -40726,65 +40465,44 @@
- }; then
- ac_cv_lib_readline_rl_completion_matches=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_func_MACRO=yes
++ ac_cv_have_errno_decl=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_func_MACRO=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cv_have_errno_decl=no
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
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
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: $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
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NEW_LIBREADLINE 1
-+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
+-_ACEOF
++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
- fi
+-fi
++ 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
-+
-+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 "$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
- cat >conftest.$ac_ext <<_ACEOF
@@ -40794,20 +40512,34 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <readline/readline.h>
-
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdlib.h>
- int
- main ()
- {
+-
+-int
+-main ()
+-{
-#ifndef rl_event_hook
- (void) rl_event_hook;
-#endif
--
-+int i = (int)setenv
- ;
- return 0;
+
+- ;
+- return 0;
++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
-rm -f conftest.$ac_objext
@@ -40829,56 +40561,59 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_rl_event_hook=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_setenv_decl=yes
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_SECURE_MKSTEMP=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_rl_event_hook=no
-+ ac_cv_have_setenv_decl=no
++ libreplace_cv_HAVE_SECURE_MKSTEMP=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5
++$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; }
++if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 1
-_ACEOF
-+$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
++$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
-+ fi
++fi
-else
-+for ac_func in setenv unsetenv
++for ac_header in stdio.h strings.h
+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_EVENT_HOOK 0
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
fi
+
+done
-
-{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
-$as_echo_n "checking for history_list in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_history_list+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
+- $as_echo_n "(cached) " >&6
++ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
++ ac_have_decl=1
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $TERMLIBS $LIBS"
@@ -40888,6 +40623,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++ ac_have_decl=0
++fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -40896,17 +40633,15 @@
-extern "C"
-#endif
-char history_list ();
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <unistd.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-return history_list ();
-+int i = (int)environ
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_SNPRINTF $ac_have_decl
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -40930,73 +40665,61 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_readline_history_list=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_environ_decl=yes
++ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
++ ac_have_decl=1
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_have_environ_decl=no
++ ac_have_decl=0
+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
- ac_cv_lib_readline_history_list=no
- fi
-+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
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VSNPRINTF $ac_have_decl
+_ACEOF
++ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
+ fi
-rm -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
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_ASPRINTF $ac_have_decl
++_ACEOF
++ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
++if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
++ ac_have_decl=1
++else
++ ac_have_decl=0
fi
-{ $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
-+done
-+
-+
-+# 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
- _ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_VASPRINTF $ac_have_decl
++_ACEOF
+
-+$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
++for ac_func in snprintf vsnprintf asprintf vasprintf
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
fi
-+rm -f conftest.err conftest.$ac_ext
++done
-###############################################
@@ -41004,9 +40727,9 @@
-{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5
-$as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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 C99 vsnprintf" >&5
++$as_echo_n "checking for C99 vsnprintf... " >&6; }
++if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_func_search_save_LIBS=$LIBS
@@ -41015,31 +40738,23 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
- #endif
+-#endif
-char yp_get_default_domain ();
-+#include <signal.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-return yp_get_default_domain ();
-+sig_atomic_t i = 0
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-for ac_lib in '' nsl; do
- if test -z "$ac_lib"; then
- ac_res="none required"
@@ -41069,13 +40784,31 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_search_yp_get_default_domain=$ac_res
--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. */
+
++#include <sys/types.h>
++#include <stdio.h>
++#include <stdarg.h>
++#include <stdlib.h>
++void foo(const char *format, ...) {
++ va_list ap;
++ int len;
++ char buf[20];
++ long long l = 1234567890;
++ l *= 100;
+
-fi
--
++ va_start(ap, format);
++ len = vsnprintf(buf, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(1);
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
@@ -41085,29 +40818,46 @@
-done
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
- :
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_sig_atomic_t=yes
++ va_start(ap, format);
++ len = vsnprintf(0, 0, format, ap);
++ va_end(ap);
++ if (len != 5) exit(2);
++
++ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
++
++ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
++ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
++ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
++ if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
++
++ exit(0);
++}
++main() { foo("hello"); }
++
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_HAVE_C99_VSNPRINTF=yes
else
- ac_cv_search_yp_get_default_domain=no
-+ libreplace_cv_sig_atomic_t=no
++ libreplace_cv_HAVE_C99_VSNPRINTF=no
fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-+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_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"
-+{ $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
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5
++$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; }
++if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
++$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
-for ac_func in yp_get_default_domain
-do
@@ -41115,11 +40865,8 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
-+$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
-+if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -41140,10 +40887,9 @@
-#else
-# include <assert.h>
-#endif
++fi
-#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
@@ -41157,16 +40903,22 @@
- 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
++$as_echo_n "checking for va_copy... " >&6; }
++if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdarg.h>
++va_list ap1,ap2;
int
main ()
{
-return $ac_func ();
-+int fd = open("/dev/null", O_DIRECT);
++va_copy(ap1,ap2);
;
return 0;
}
@@ -41193,20 +40945,19 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=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_var=no"
-+ libreplace_cv_HAVE_OPEN_O_DIRECT=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ libreplace_cv_HAVE_VA_COPY=no
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -41218,17 +40969,19 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
-+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
-+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
-
--fi
+-
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-done
-+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
++{ $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
-+fi
++$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
-# Check if we have execl, if not we need to compile smbrun.
++fi
-for ac_func in execl
-do
@@ -41236,9 +40989,10 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking 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 :
++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
- cat >conftest.$ac_ext <<_ACEOF
@@ -41278,14 +41032,15 @@
-choke me
-#endif
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+#include <sys/types.h>
++#include <stdarg.h>
++va_list ap1,ap2;
int
main ()
{
-return $ac_func ();
-+volatile int i = 0
++__va_copy(ap1,ap2);
;
return 0;
}
@@ -41312,20 +41067,21 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_volatile=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_var=no"
-+ libreplace_cv_volatile=no
++ libreplace_cv_HAVE___VA_COPY=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -41337,16 +41093,17 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5
-+$as_echo "$libreplace_cv_volatile" >&6; }
-+if test x"$libreplace_cv_volatile" = x"yes"; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $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
-fi
-done
-+$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
++$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
-if test x"$ac_cv_func_execl" = x"no"; then
- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
++fi
fi
-
@@ -41361,13 +41118,9 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+# filesys
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
++$as_echo_n "checking for __FUNCTION__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -41375,8 +41128,7 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -41407,15 +41159,15 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+#include <sys/types.h>
-+#include <$ac_hdr>
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
int
main ()
{
-return $ac_func ();
-+if ((DIR *) 0)
-+return 0;
++printf("%s\n", __FUNCTION__);
;
return 0;
}
@@ -41443,12 +41195,740 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "$as_ac_Header=yes"
++ libreplace_cv_HAVE_FUNCTION_MACRO=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++ libreplace_cv_HAVE_FUNCTION_MACRO=no
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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
+
+-for ac_func in strtol
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
++$as_echo_n "checking for __func__ macro... " >&6; }
++if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* 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 <stdio.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++printf("%s\n", __func__);
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_func_MACRO=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ libreplace_cv_HAVE_func_MACRO=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5
++$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; }
++ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
+
+-rm -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_func_MACRO 1" >>confdefs.h
++
++ fi
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
++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_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
++
+ done
+
+
++ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
++if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
+
+-for ac_func in strchr chflags
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
++$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++fi
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
++$as_echo_n "checking for setenv declaration... " >&6; }
++if test "${ac_cv_have_setenv_decl+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++int i = (int)setenv
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_have_setenv_decl=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ ac_cv_have_setenv_decl=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5
++$as_echo "$ac_cv_have_setenv_decl" >&6; }
++ if test x"$ac_cv_have_setenv_decl" = x"yes"; then
++
++$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h
++
++ fi
++
++for ac_func in setenv unsetenv
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -40095,102 +9211,56 @@
+ done
+
+
+-
+-
+-
+-for ac_func in getrlimit fsync fdatasync setpgid
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ { $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
+@@ -40199,255 +9269,183 @@
+ done
+
+
++# this test disabled as we don't actually need __VA_ARGS__ yet
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++#define eprintf(...) fprintf(stderr, __VA_ARGS__)
++eprintf("bla", "bar");
+
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
+
++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
+
+-for ac_func in setsid glob strpbrk crypt16 getauthuid
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
++fi
++rm -f conftest.err conftest.$ac_ext
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
+
+-#undef $ac_func
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
+ #endif
+-
++#include <signal.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++sig_atomic_t i = 0
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_sig_atomic_t=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ libreplace_cv_sig_atomic_t=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $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
+
+-fi
+-done
++$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
+
++fi
+
+
++{ $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 confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++#include <unistd.h>
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
++#endif
++int
++main ()
++{
++int fd = open("/dev/null", O_DIRECT);
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_HAVE_OPEN_O_DIRECT=yes
++else
++ libreplace_cv_HAVE_OPEN_O_DIRECT=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
++$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
++if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
+
++$as_echo "#define HAVE_OPEN_O_DIRECT 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 "$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
+-/* 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 <sys/types.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++volatile int i = 0
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_volatile=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ 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
++
++$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
++
++fi
++
++# 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>
+
+- eval "$as_ac_var=no"
++int
++main ()
++{
++if ((DIR *) 0)
++return 0;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "$as_ac_Header=yes"
++else
+ eval "$as_ac_Header=no"
fi
-
@@ -41476,9 +41956,15 @@
+ac_header_dirent=$ac_hdr; break
fi
-done
+-
+-
+-
+-
+-
-
--for ac_func in strtol
+-
+-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
@@ -41519,7 +42005,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -39929,101 +9453,56 @@
+@@ -40455,106 +9453,56 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -41616,7 +42102,12 @@
+fi
--for ac_func in strchr chflags
+-
+-
+-
+-
+-
+-for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -41655,7 +42146,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40031,166 +9510,148 @@
+@@ -40562,170 +9510,148 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -41776,7 +42267,21 @@
+done
--for ac_func in getrlimit fsync fdatasync setpgid
++# 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 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
@@ -41786,13 +42291,15 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# select
-+for ac_header in sys/select.h
++# time
++for ac_header in sys/time.h utime.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 :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SELECT_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -41800,21 +42307,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
++done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -41829,21 +42336,6 @@
-#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 :
@@ -41862,9 +42354,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
@@ -41887,9 +42379,6 @@
- $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
@@ -41928,7 +42417,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -40199,425 +9660,311 @@
+@@ -40734,210 +9660,170 @@
done
@@ -41936,7 +42425,8 @@
-
-
-
--for ac_func in setsid glob strpbrk crypt16 getauthuid
+-
+-for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -42077,10 +42567,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
@@ -42094,61 +42584,51 @@
+ int i;
-+ ;
-+ 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
+-for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
-+$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
-+if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ ;
++ return 0;
++}
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
++if ac_fn_c_try_compile "$LINENO"; then :
++ 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
-#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
++fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -42163,6 +42643,15 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
++$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
++if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
+ #ifdef HAVE_SYS_CAPABILITY_H
+ #include <sys/capability.h>
+ #endif
@@ -42239,34 +42728,28 @@
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- fi
--done
--
--
--
-
++_ACEOF
++
++fi
++
+done
-
++
+for ac_func in getpwnam_r getpwuid_r getpwent_r
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -40946,304 +9832,139 @@
+ done
-+fi
-+done
-
--for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+-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
@@ -42373,52 +42856,137 @@
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5
+$as_echo "$ac_cv_have_getpwent_r_decl" >&6; }
+ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then
-+
+
+-fi
+-done
+$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h
-+
+
+ fi
-+
+
+-for ac_func in getdents64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5
+$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; }
+if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+ $ac_includes_default
-+
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ #include <unistd.h>
+ #include <pwd.h>
-+
+
+-#undef $ac_func
+ struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)
+ {
-+
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- 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
+ #ifndef HAVE_GETPWENT_R_DECL
+ #error missing getpwent_r prototype
+ #endif
+ return NULL;
+
+ }
-+
+
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-
--fi
--done
++
+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
++
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-+else
-
+- eval "$as_ac_var=no"
+-fi
+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
-+fi
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&5
+$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&6; }
+if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then :
@@ -42427,14 +42995,14 @@
+$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
--for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
++fi
+
+-for ac_func in setenv strcasecmp fcvt fcvtl
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+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 :
@@ -42563,55 +43131,21 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -40626,255 +9973,221 @@
+@@ -41252,328 +9973,220 @@
done
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5
-+$as_echo_n "checking for getgrent_r declaration... " >&6; }
-+if test "${ac_cv_have_getgrent_r_decl+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+ #include <unistd.h>
-+ #include <grp.h>
-
-+int
-+main ()
-+{
-+int i = (int)getgrent_r
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_have_getgrent_r_decl=yes
-+else
-+ ac_cv_have_getgrent_r_decl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getgrent_r_decl" >&5
-+$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
-+ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
-
-+$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
-
-+ fi
-
-
--for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64
+-
+-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 "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
-+$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; }
-+if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5
++$as_echo_n "checking for getgrent_r declaration... " >&6; }
++if test "${ac_cv_have_getgrent_r_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -42619,29 +43153,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 <grp.h>
-#undef $ac_func
-+ struct group *getgrent_r(struct group *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
@@ -42656,20 +43186,17 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+ #ifndef HAVE_GETGRENT_R_DECL
-+ #error missing getgrent_r prototype
-+ #endif
-+ return NULL;
-+
-+ }
++ #include <unistd.h>
++ #include <grp.h>
--int
--main ()
--{
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
++int i = (int)getgrent_r
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -42694,20 +43221,19 @@
- }; then
- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
-+
++ ac_cv_have_getgrent_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_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
-
++ ac_cv_have_getgrent_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"'`
@@ -42718,29 +43244,68 @@
- 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_getgrent_r_decl" >&5
++$as_echo "$ac_cv_have_getgrent_r_decl" >&6; }
++ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then
++
++$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h
++
++ fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
++$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; }
++if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ $ac_includes_default
++
++ #include <unistd.h>
++ #include <grp.h>
++
++ struct group *getgrent_r(struct group *src, char *buf, int buflen)
++ {
++
++ #ifndef HAVE_GETGRENT_R_DECL
++ #error missing getgrent_r prototype
++ #endif
++ return NULL;
++
++ }
++
+ _ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
++
++else
++
++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
fi
-done
--
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
+$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
+if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
-+$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
-
-
-+fi
-
-
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-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 "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
++
++
++fi
++
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
+$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; }
+if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
@@ -42836,10 +43401,20 @@
- 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
-+
-+fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_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 :
@@ -42854,14 +43429,25 @@
+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
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETGROUPLIST 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
+ _ACEOF
+
+ fi
+ done
+
+
+-for ac_func in nanosleep
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+# locale
+for ac_header in ctype.h locale.h langinfo.h
+do :
@@ -42871,16 +43457,50 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
+ _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
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
+
+-#undef $ac_func
+done
-+
-+
+
+-/* 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 :
@@ -42888,9 +43508,40 @@
+if test "x$ac_cv_header_fnmatch_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_FNMATCH_H 1
-+_ACEOF
-+
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
fi
+
+-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
@@ -42898,7 +43549,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
+done
+
+
@@ -42914,9 +43564,10 @@
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- fi
+-else
++fi
+
- done
++done
+# terminal
@@ -42929,22 +43580,21 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-+
+
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS $LIBS"
+fi
+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
+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
++
+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; }
@@ -42959,42 +43609,18 @@
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -40882,100 +10195,85 @@
+@@ -41582,112 +10195,85 @@
#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 ();
+char dlopen ();
int
main ()
{
--return $ac_func ();
+-return nanosleep ();
+return dlopen ();
;
return 0;
@@ -43021,7 +43647,8 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_lib_ext_rt_nanosleep=yes;
+- ac_cv_lib_ext_rt=yes
+for ac_lib in '' dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -43054,32 +43681,33 @@
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- eval "$as_ac_var=no"
+- ac_cv_lib_ext_rt_nanosleep=no;
+- ac_cv_lib_ext_rt=no
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+
+
+-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
+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
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_NANOSLEEP 1
+#define HAVE_DLFCN_H 1
-+_ACEOF
-+
+ _ACEOF
+
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+
+
+-LIBS=$ac_check_lib_ext_save_LIBS
+done
-+
+
+-if test $ac_cv_lib_ext_rt = yes; then
+for ac_func in dlopen dlsym dlerror dlclose
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -43087,16 +43715,28 @@
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_LIBRT 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+- case "$LIBS" in
+- *-lrt*)
+- ;;
+- *)
+- LIBS="-lrt $LIBS"
+- ;;
+- esac
+-
+-
+-fi
+-
+else
+ libreplace_cv_dlfcn=yes
fi
done
--for ac_func in getpwent_r
+-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
@@ -43135,7 +43775,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -40983,1172 +10281,612 @@
+@@ -41695,419 +10281,231 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -43179,6 +43819,9 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+for ac_lib in '' sl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
@@ -43196,35 +43839,23 @@
+fi
+done
+if test "${ac_cv_search_shl_load+set}" = set; then :
-+
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+
+- eval "$as_ac_var=no"
++else
+ ac_cv_search_shl_load=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_shl_load" >&5
+$as_echo "$ac_cv_search_shl_load" >&6; }
+ac_res=$ac_cv_search_shl_load
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- eval "$as_ac_var=no"
- fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+for ac_header in dl.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dl_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DL_H 1
-+_ACEOF
-+
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -43234,25 +43865,37 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
++for ac_header in dl.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
++if test "x$ac_cv_header_dl_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_DL_H 1
+ _ACEOF
+
+ fi
+-done
+
+done
-+
+
+for ac_func in shl_load shl_unload shl_findsym
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+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_shl=yes
- fi
- done
++fi
++done
--for ac_func in getdents64
+-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
@@ -43347,8 +43990,10 @@
-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 \
@@ -43364,20 +44009,25 @@
- 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 setenv strcasecmp fcvt fcvtl
++if test x"${libreplace_cv_dlfcn}" = x"yes";then
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
++fi
+
++LIBDL="$LIBS"
+
+-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
@@ -43394,11 +44044,15 @@
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
++LIBS="$save_LIBS"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++ac_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
-#ifdef __STDC__
@@ -43406,11 +44060,13 @@
-#else
-# include <assert.h>
-#endif
++ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
++if test "x$ac_cv_func_getpassphrase" = x""yes; then :
++ libreplace_cv_HAVE_GETPASSPHRASE=yes
++fi
-#undef $ac_func
-+if test x"${libreplace_cv_dlfcn}" = x"yes";then
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
-+fi
++if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -43425,130 +44081,25 @@
-#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
--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
-- 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
++else
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
+$as_echo_n "checking whether getpass should be replaced... " >&6; }
+if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-
--#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"
@@ -43613,132 +44164,178 @@
+{ $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
+-done
+fi
--for ac_func in setlocale nl_langinfo
+-for ac_header in sys/mman.h
-do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5
+$as_echo_n "checking whether strptime is available and works... " >&6; }
+if test "${libreplace_cv_STRPTIME_OK+set}" = set; then :
$as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--/* 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
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
+- ac_header_compiler=no
+-fi
+ 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
+-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; }
+ #define LIBREPLACE_CONFIGURE_TEST_STRPTIME
+ #include "$libreplacedir/test/strptime.c"
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$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"
+- ac_header_preproc=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
+-
+- ac_header_preproc=no
+ 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"
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ---------------------------------------- ##
+-## Report this to samba-technical at samba.org ##
+-## ---------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5
+$as_echo "$libreplace_cv_STRPTIME_OK" >&6; }
+if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
+
++$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
+
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
+-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
+for ac_header in direct.h windows.h winsock2.h ws2tcpip.h
@@ -43748,16 +44345,16 @@
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+@@ -42116,581 +10514,378 @@
- fi
-+
done
+-# setbuffer, shmget, shm_open are needed for smbtorture
+-
--for ac_func in nanosleep
+-for ac_func in shmget shm_open
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -43886,26 +44483,43 @@
+#define HAVE_TIMEGM 1
_ACEOF
- else
++else
+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
-+fi
-+done
+ fi
+ 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 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
-
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lrt $LIBS $LIBS"
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
+ if test "$cross_compiling" = yes; then :
+ libreplace_cv_READDIR_NEEDED="assuming not"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+#define test_readdir_os2_delete main
+#include "$libreplacedir/test/os2_delete.c"
+_ACEOF
@@ -43918,11 +44532,30 @@
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-#undef $ac_func
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5
+$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; }
-+
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+for ac_func in dirfd
+do :
+ ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
@@ -43930,40 +44563,24 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DIRFD 1
+_ACEOF
-+
+
+fi
+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
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
+$as_echo_n "checking for dirfd declaration... " >&6; }
+if test "${ac_cv_have_dirfd_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char nanosleep ();
++ $as_echo_n "(cached) " >&6
++else
++
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <dirent.h>
int
main ()
{
--return nanosleep ();
+-return $ac_func ();
+int i = (int)dirfd
;
return 0;
@@ -43990,43 +44607,38 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ext_rt_nanosleep=yes;
-- ac_cv_lib_ext_rt=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_have_dirfd_decl=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"
+ 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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5
--$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
-- if test $ac_cv_lib_ext_rt_nanosleep = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_NANOSLEEP 1
--_ACEOF
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5
+$as_echo "$ac_cv_have_dirfd_decl" >&6; }
+ if test x"$ac_cv_have_dirfd_decl" = x"yes"; then
-
--fi
++
+$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
+#
@@ -44036,26 +44648,16 @@
+ ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
+if test "x$ac_cv_func_getdirentries" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRT 1
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETDIRENTRIES 1
_ACEOF
-- case "$LIBS" in
-- *-lrt*)
-- ;;
-- *)
-- LIBS="-lrt $LIBS"
-- ;;
-- esac
--
--
--fi
--
fi
done
-
--for ac_func in utimensat
+-
+-for ac_func in bindtextdomain textdomain
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44150,8 +44752,10 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
--fi
+ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=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 \
@@ -44167,27 +44771,24 @@
- 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_long_telldir_const_DIR_pdir_" >&5
+$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
+if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
-
-
++
++
+$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
++
+ fi
+-done
-+fi
--for ac_func in mlock munlock mlockall munlockall
+-for ac_func in strupr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype 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 :
@@ -44303,165 +44904,22 @@
+if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
+-# Find a method of generating a stack trace
+$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
+-for ac_header in execinfo.h libexc.h libunwind.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$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 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
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -44490,8 +44948,7 @@
-#include <$ac_header>
+
+#define _LIBREPLACE_REPLACE_H
-+#error _donot_use_getdents_replacement_anymore
-+#include "$libreplacedir/repdir_getdents.c"
++#include "$libreplacedir/repdir_getdirentries.c"
+#define test_readdir_os2_delete main
+#include "$libreplacedir/test/os2_delete.c"
_ACEOF
@@ -44515,23 +44972,23 @@
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_READDIR_GETDENTS=yes
++ libreplace_cv_READDIR_GETDIRENTRIES=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_READDIR_GETDENTS=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
++
- 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
++{ $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
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -44543,10 +45000,44 @@
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
++
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
++ libreplace_cv_READDIR_NEEDED=no
++fi
++
++#
++# try to replace with getdents() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdents
++do :
++ ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
++if test "x$ac_cv_func_getdents" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETDENTS 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++fi
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
++$as_echo_n "checking for replacing readdir using getdents()... " >&6; }
++if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ if test "$cross_compiling" = yes; then :
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -44567,20 +45058,36 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++
++#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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ libreplace_cv_READDIR_GETDENTS=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
- ac_header_preproc=no
--fi
-+$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
++
++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 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
++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -44616,6 +45123,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
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
++
++$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
++
++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
++ libreplace_cv_READDIR_NEEDED=no
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking a usable readdir()" >&5
+$as_echo_n "checking a usable readdir()... " >&6; }
+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
@@ -44623,20 +45143,14 @@
+$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"
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-
--fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
+###############################################
+# test for where we get crypt() from
+for ac_header in crypt.h
@@ -44652,72 +45166,51 @@
done
--# setbuffer, shmget, shm_open are needed for smbtorture
--
--
--for ac_func in shmget shm_open
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-# libexecinfo provides backtrace_symbols on FreeBSD
+-{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
+-$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
+-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
+$as_echo_n "checking for library containing crypt... " >&6; }
+if test "${ac_cv_search_ext_crypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
++
+ac_func_search_ext_save_LIBS=$LIBS
+ac_cv_search_ext_crypt=no
+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
-@@ -42156,101 +10894,25 @@
+@@ -42699,105 +10894,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
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
+-char backtrace_symbols ();
+char crypt ();
int
main ()
{
--return $ac_func ();
+-return backtrace_symbols ();
+return crypt ();
;
return 0;
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-for ac_lib in '' execinfo; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -44738,37 +45231,41 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_search_backtrace_symbols=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
+-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+- conftest$ac_exeext
+- if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+- break
-fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
+-done
+-if test "${ac_cv_search_backtrace_symbols+set}" = set; then
+- :
+-else
+- ac_cv_search_backtrace_symbols=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
+-$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
+-ac_res=$ac_cv_search_backtrace_symbols
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_ext_crypt="none required"
fi
--done
-
-
--
--for ac_func in gettext dgettext
+-for ac_func in backtrace_symbols
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -44807,7 +45304,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -42258,1278 +10920,665 @@
+@@ -42805,1082 +10920,666 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -44859,13 +45356,13 @@
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_ext_crypt="-l$ac_lib"
+break
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ done
+fi
+LIBS=$ac_func_search_ext_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_crypt" >&5
+$as_echo "$ac_cv_search_ext_crypt" >&6; }
+if test "$ac_cv_search_ext_crypt" != no; then :
@@ -44904,61 +45401,76 @@
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`
--{ $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 trace_back_stack in -lexc" >&5
+-$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
+-if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
++echo "LIBREPLACE_BROKEN_CHECKS: END"
++
++for ac_func in syslog
++do :
++ 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 HAVE_SYSLOG 1
++_ACEOF
++
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lexc $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ as_fn_error "Required function not found" "$LINENO" 5
++fi
++done
++
++
++echo "LIBREPLACE_NETWORK_CHECKS: START"
++
++
++$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
++
++LIBREPLACE_NETWORK_OBJS=""
++LIBREPLACE_NETWORK_LIBS=""
++
++for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _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
--
+-char trace_back_stack ();
-int
-main ()
-{
--return $ac_func ();
+-return trace_back_stack ();
- ;
- return 0;
-}
--_ACEOF
++fi
++
++done
++
++for ac_header in netinet/in_systm.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
++if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NETINET_IN_SYSTM_H 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -44980,88 +45492,126 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_lib_exc_trace_back_stack=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+for ac_func in syslog
-+do :
-+ 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 HAVE_SYSLOG 1
-+_ACEOF
-- eval "$as_ac_var=no"
-+else
-+ as_fn_error "Required function not found" "$LINENO" 5
+- ac_cv_lib_exc_trace_back_stack=no
fi
-+done
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
+-LIBS=$ac_check_lib_save_LIBS
++done
+
-+echo "LIBREPLACE_NETWORK_CHECKS: START"
++for ac_header in netinet/ip.h
++do :
++ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
++ #include <sys/types.h>
++ #ifdef HAVE_NETINET_IN_H
++ #include <netinet/in.h>
++ #endif
++ #ifdef HAVE_NETINET_IN_SYSTM_H
++ #include <netinet/in_systm.h>
++ #endif
+
++"
++if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NETINET_IP_H 1
++_ACEOF
+
-+$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
+-$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
+-if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then
+
-+LIBREPLACE_NETWORK_OBJS=""
-+LIBREPLACE_NETWORK_LIBS=""
++done
+
-+for ac_header in sys/socket.h netinet/in.h netdb.h arpa/inet.h
++for ac_header in netinet/tcp.h netinet/in_ip.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_LIBEXC 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+- LIBS="-lexc $LIBS"
++fi
++
++done
++
++for ac_header in sys/sockio.h sys/un.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
fi
--done
+done
--for ac_func in strupr
+-# check for sysctlbyname for BSD systems
++for ac_header in sys/uio.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_uio_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_UIO_H 1
++_ACEOF
+
+-for ac_func in sysctlbyname
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++fi
++
++done
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable net/if.h" >&5
++$as_echo_n "checking for usable net/if.h... " >&6; }
++if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+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
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++ $ac_includes_default
++ #if HAVE_SYS_SOCKET_H
++ # include <sys/socket.h>
++ #endif
++ #include <net/if.h>
++ int main(void) {return 0;}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ libreplace_cv_USABLE_NET_IF_H=yes
++else
++ libreplace_cv_USABLE_NET_IF_H=no
-#ifdef __STDC__
-# include <limits.h>
@@ -45069,9 +45619,13 @@
-# include <assert.h>
-#endif
+fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-#undef $ac_func
-+done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_USABLE_NET_IF_H" >&5
++$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; }
++if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -45086,28 +45640,31 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+for ac_header in netinet/ip.h
-+do :
-+ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "
-+ #include <sys/types.h>
-+ #ifdef HAVE_NETINET_IN_H
-+ #include <netinet/in.h>
-+ #endif
-+ #ifdef HAVE_NETINET_IN_SYSTM_H
-+ #include <netinet/in_systm.h>
-+ #endif
++$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
++
++fi
++
++
++
++cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
++$as_echo_n "checking for socklen_t... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
--int
--main ()
--{
++$ac_includes_default
++#include <sys/socket.h>
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
-+"
-+if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETINET_IP_H 1
++socklen_t foo;
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -45131,9 +45688,28 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "ac_cv_type_$cv=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ eval "ac_cv_type_$cv=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
++if test "x$ac_cv_type_socklen_t" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SOCKLEN_T 1
++_ACEOF
++
- eval "$as_ac_var=no"
fi
@@ -45141,18 +45717,6 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+done
-+
-+for ac_header in netinet/tcp.h netinet/in_ip.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -45161,48 +45725,31 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+done
-+
-+for ac_header in sys/sockio.h sys/un.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
_ACEOF
fi
-+
- done
+-done
-+for ac_header in sys/uio.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_uio_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_UIO_H 1
-+_ACEOF
--# Find a method of generating a stack trace
-+fi
+-#############################
+-# check if building with gpfs
-+done
-
-
--for ac_header in execinfo.h libexc.h libunwind.h
+-for ac_header in gpfs_gpl.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable net/if.h" >&5
-+$as_echo_n "checking for usable net/if.h... " >&6; }
-+if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then :
++cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
++$as_echo_n "checking for sa_family_t... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
@@ -45218,18 +45765,19 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
+
-+ $ac_includes_default
-+ #if HAVE_SYS_SOCKET_H
-+ # include <sys/socket.h>
-+ #endif
-+ #include <net/if.h>
-+ int main(void) {return 0;}
+ $ac_includes_default
+-#include <$ac_header>
++#include <sys/socket.h>
++int
++main ()
++{
++sa_family_t foo;
++ ;
++ return 0;
++}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
@@ -45251,18 +45799,27 @@
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+if ac_fn_c_try_compile "$LINENO"; then :
-+ libreplace_cv_USABLE_NET_IF_H=yes
++ eval "ac_cv_type_$cv=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ libreplace_cv_USABLE_NET_IF_H=no
-
+-
- ac_header_compiler=no
++ eval "ac_cv_type_$cv=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
++if test "x$ac_cv_type_sa_family_t" = x""yes; then :
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -45274,7 +45831,9 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SA_FAMILY_T 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -45296,15 +45855,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_USABLE_NET_IF_H" >&5
-+$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; }
-+if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
-+
-+$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
-
+-
- ac_header_preproc=no
- fi
+-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -45343,51 +45896,14 @@
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+
-+cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
-+$as_echo_n "checking for socklen_t... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- eval "$as_ac_Header=\$ac_header_preproc"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+$ac_includes_default
-+#include <sys/socket.h>
-+int
-+main ()
-+{
-+socklen_t foo;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
-+else
-+ eval "ac_cv_type_$cv=no"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
-+if test "x$ac_cv_type_socklen_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SOCKLEN_T 1
-+_ACEOF
-+
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -45396,8 +45912,6 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+
-+fi
-+
+cat >>confdefs.h <<_ACEOF
+#define $ac_tr_hdr 1
_ACEOF
@@ -45405,169 +45919,26 @@
fi
-done
-
--# libexecinfo provides backtrace_symbols on FreeBSD
--{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
--$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
--if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-+
-+cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
-+$as_echo_n "checking for sa_family_t... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+-
+-if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GPFS 1
-_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char backtrace_symbols ();
-+$ac_includes_default
-+#include <sys/socket.h>
- int
- main ()
- {
--return backtrace_symbols ();
-+sa_family_t foo;
- ;
- return 0;
- }
- _ACEOF
--for ac_lib in '' execinfo; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_search_backtrace_symbols=$ac_res
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ eval "ac_cv_type_$cv=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
-+if test "x$ac_cv_type_sa_family_t" = x""yes; then :
-
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SA_FAMILY_T 1
-+_ACEOF
-
+- default_shared_modules="$default_shared_modules vfs_gpfs"
-fi
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_backtrace_symbols+set}" = set; then
-- :
--else
-- ac_cv_search_backtrace_symbols=no
- fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
--$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
--ac_res=$ac_cv_search_backtrace_symbols
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
--
--for ac_func in backtrace_symbols
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
+-#############################################
+-# check if building on Isilon OneFS
+-printf "%s" "checking for Isilon OneFS... "
+-save_LIBS="$LIBS"
+-LIBS="$LIBS -lisi_version"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+fi
-
--#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
+cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
+$as_echo_n "checking for struct addrinfo... " >&6; }
@@ -45575,14 +45946,15 @@
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
+ /* end confdefs.h. */
+-#include <isi_version/isi_version.h>
++
+$ac_includes_default
+#include <netdb.h>
int
main ()
{
--return $ac_func ();
+-get_isilon_copyright()
+struct addrinfo foo;
;
return 0;
@@ -45609,16 +45981,34 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- samba_cv_HAVE_ONEFS=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "ac_cv_type_$cv=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- samba_cv_HAVE_ONEFS=no
+ eval "ac_cv_type_$cv=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
+-echo $samba_cv_HAVE_ONEFS
+-if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ONEFS 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"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+ac_foo=`eval echo \\$ac_cv_type_$cv`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+$as_echo "$ac_foo" >&6; }
@@ -45627,70 +46017,82 @@
+if false; then
+ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
-+
+
+-LIBS="$save_LIBS"
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_ADDRINFO 1
+_ACEOF
-+
-- eval "$as_ac_var=no"
- fi
+-# Note that all the libunwind symbols in the API are defined to internal
+-# platform-specific version, so we must include libunwind.h before checking
+-# any of them.
+-{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5
+-$as_echo_n "checking for libunwind... " >&6; }
+-save_LIBS=$LIBS
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+-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
--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
-+
+
+-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
++fi
+
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define $ac_tr_hdr 1
_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
- fi
--done
-
-
--{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5
--$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
--if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then
+-#ifdef HAVE_LIBUNWIND_H
+-#include <libunwind.h>
+-#endif
++fi
+
++
+
+cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
+$as_echo_n "checking for struct sockaddr... " >&6; }
+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lexc $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $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
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char trace_back_stack ();
++/* end confdefs.h. */
++
+$ac_includes_default
+#include <sys/socket.h>
int
main ()
{
--return trace_back_stack ();
+-
+- unw_context_t ctx; unw_cursor_t cur;
+- char buf[256]; unw_word_t off;
+- unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
+- unw_get_proc_name(&cur, buf, sizeof(buf), &off);
+-
+struct sockaddr foo;
;
return 0;
@@ -45717,12 +46119,9 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_exc_trace_back_stack=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "ac_cv_type_$cv=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
+ eval "ac_cv_type_$cv=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -45739,179 +46138,37 @@
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR 1
+_ACEOF
-+
-- ac_cv_lib_exc_trace_back_stack=no
- fi
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5
--$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
--if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBEXC 1
--_ACEOF
-
-- LIBS="-lexc $LIBS"
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
-+_ACEOF
-
- fi
-
-
--# check for sysctlbyname for BSD systems
-
--for ac_func in sysctlbyname
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
-+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
-+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef $ac_func
-+$ac_includes_default
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-
- int
- main ()
- {
--return $ac_func ();
-+struct sockaddr_storage foo;
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ eval "ac_cv_type_$cv=no"
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND 1
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-+_ACEOF
-+
-
-- eval "$as_ac_var=no"
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+
-+cat >>confdefs.h <<_ACEOF
+#define $ac_tr_hdr 1
_ACEOF
- fi
--done
++fi
+- # If we have libunwind, test whether we also have libunwind-ptrace
+- # which would let us unwind arbitrary processes.
+- save_LIBS=$LIBS
--#############################
--# check if building with gpfs
-
--for ac_header in gpfs_gpl.h
+-for ac_header in libunwind-ptrace.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
-+$as_echo_n "checking for struct sockaddr_in6... " >&6; }
++
++cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
++$as_echo_n "checking for struct sockaddr_storage... " >&6; }
+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
-fi
@@ -45930,9 +46187,22 @@
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--$ac_includes_default
++
+ $ac_includes_default
-#include <$ac_header>
--_ACEOF
++
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++
++int
++main ()
++{
++struct sockaddr_storage foo;
++ ;
++ return 0;
++}
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -45952,20 +46222,28 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "ac_cv_type_$cv=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
--fi
-+$ac_includes_default
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ eval "ac_cv_type_$cv=no"
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -45977,13 +46255,8 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+int
-+main ()
-+{
-+struct sockaddr_in6 foo;
-+ ;
-+ return 0;
-+}
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_STORAGE 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -46003,29 +46276,12 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "ac_cv_type_$cv=yes"
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-+ eval "ac_cv_type_$cv=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
-+$as_echo "$ac_foo" >&6; }
-+if test "$ac_foo" = yes; then
-+ ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+ ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_IN6 1
-+_ACEOF
+-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -46088,72 +46344,44 @@
-done
--if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
-+if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
-+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GPFS 1
--_ACEOF
-+"
-+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
+- { $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
+-$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
+-if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then
+
-+$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
-
-- default_shared_modules="$default_shared_modules vfs_gpfs"
- fi
-
--#############################################
--# check if building on Isilon OneFS
--printf "%s" "checking for Isilon OneFS... "
--save_LIBS="$LIBS"
--LIBS="$LIBS -lisi_version"
++cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
++$as_echo_n "checking for struct sockaddr_in6... " >&6; }
++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lunwind-ptrace $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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 _UPT_create ();
++$ac_includes_default
+
-+if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
-+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" "
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+
-+"
-+if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then :
-+
-+$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h
-+
-+fi
-+
-+fi
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
-+$as_echo_n "checking for sin_len in sock... " >&6; }
-+if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <isi_version/isi_version.h>
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
int
main ()
{
--get_isilon_copyright()
-+
-+struct sockaddr_in sock; sock.sin_len = sizeof(sock);
-+
+-return _UPT_create ();
++struct sockaddr_in6 foo;
;
return 0;
}
@@ -46179,152 +46407,95 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- samba_cv_HAVE_ONEFS=yes
--else
+- ac_cv_lib_unwind_ptrace__UPT_create=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "ac_cv_type_$cv=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
-- samba_cv_HAVE_ONEFS=no
--fi
-+ libreplace_cv_HAVE_SOCK_SIN_LEN=yes
-
+-
+- ac_cv_lib_unwind_ptrace__UPT_create=no
++ eval "ac_cv_type_$cv=no"
+ fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--echo $samba_cv_HAVE_ONEFS
--if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
-+else
+-LIBS=$ac_check_lib_save_LIBS
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
+-$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
+-if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
+-
+- LIBUNWIND_PTRACE="-lunwind-ptrace";
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
++$as_echo "$ac_foo" >&6; }
++if test "$ac_foo" = yes; then
++ ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++ ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_ONEFS 1
--_ACEOF
-+ libreplace_cv_HAVE_SOCK_SIN_LEN=no
+-#define HAVE_LIBUNWIND_PTRACE 1
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_IN6 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"
+
+-else
+- LIBUNWIND_PTRACE=""
fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--LIBS="$save_LIBS"
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
-+$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
-+if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
--# Note that all the libunwind symbols in the API are defined to internal
--# platform-specific version, so we must include libunwind.h before checking
--# any of them.
--{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5
--$as_echo_n "checking for libunwind... " >&6; }
--save_LIBS=$LIBS
-+$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
+- LIBS=$save_LIBS
++cat >>confdefs.h <<_ACEOF
++#define $ac_tr_hdr 1
++_ACEOF
--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
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
--case "$UNWIND_ARCH" in
-- unknown)
-- # This probably won't link without
-- # the platform-specific libunwind.
-- LIBS="$LIBS -lunwind"
-- ;;
-- i386|i586|i686)
-- # Add the platform-specific libunwind module.
-- LIBS="$LIBS -lunwind -lunwind-x86"
-- ;;
-- *)
-- # Add the platform-specific libunwind module.
-- # based on uname -i, uname -m or uname -p
-- LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
-- ;;
--esac
-+############################################
-+# check for unix domain sockets
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
-+$as_echo_n "checking for unix domain sockets... " >&6; }
-+if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--#ifdef HAVE_LIBUNWIND_H
--#include <libunwind.h>
--#endif
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- LIBS=$save_LIBS
++if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "
+#include <sys/socket.h>
-+#include <sys/un.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++
++"
++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
++
++$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
- int
- main ()
- {
+ fi
-- unw_context_t ctx; unw_cursor_t cur;
-- char buf[256]; unw_word_t off;
-- unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
-- unw_get_proc_name(&cur, buf, sizeof(buf), &off);
-+struct sockaddr_un sunaddr;
-+sunaddr.sun_family = AF_UNIX;
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
--
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND 1
--_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
+-# To use libunwind-ptrace, we also need to make some ptrace system calls.
+-if test x"$LIBUNWIND_PTRACE" != x"" ; then
++if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" "
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++
++"
++if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then :
++
++$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h
-+ 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
--
--for ac_header in libunwind-ptrace.h
+-for ac_header in sys/ptrace.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -46332,7 +46503,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
@@ -46369,19 +46540,23 @@
- 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
-+ libreplace_cv_HAVE_UNIXSOCKET=no
-
+fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
++$as_echo_n "checking for sin_len in sock... " >&6; }
++if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -46390,7 +46565,8 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -46416,15 +46592,27 @@
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5
-+$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
-+if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
+-fi
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
++int
++main ()
++{
++
++struct sockaddr_in sock; sock.sin_len = sizeof(sock);
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ libreplace_cv_HAVE_SOCK_SIN_LEN=yes
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -46460,68 +46648,208 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
+ else
- eval "$as_ac_Header=\$ac_header_preproc"
++
++ libreplace_cv_HAVE_SOCK_SIN_LEN=no
++
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5
++$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; }
++if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
++
++$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h
+
+ fi
+
+-done
++############################################
++# check for unix domain sockets
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
++$as_echo_n "checking for unix domain sockets... " >&6; }
++if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
+
+- { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
+-$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-#if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+-#endif
+-#if HAVE_SYS_PTRACE_H
+-#include <sys/ptrace.h>
+-#endif
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
+
+ int
+ main ()
+ {
+
+- pid_t me = (pid_t)-1;
+- ptrace(PTRACE_ATTACH, me, 0, 0);
+- ptrace(PTRACE_DETACH, me, 0, 0);
+- return 0;
++struct sockaddr_un sunaddr;
++sunaddr.sun_family = AF_UNIX;
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+-
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LINUX_PTRACE 1
+-_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+
++ libreplace_cv_HAVE_UNIXSOCKET=yes
+
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- LIBUNWIND_PTRACE=""
++ libreplace_cv_HAVE_UNIXSOCKET=no
+
+ fi
++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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5
++$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; }
++if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
+
++$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h
+
++fi
+
+for ac_func in connect
+do :
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_CONNECT 1
- _ACEOF
++_ACEOF
- fi
--
- done
++fi
++done
-- { $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
--$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
--if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then
+if test x"$ac_cv_func_connect" = 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 "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
+$as_echo_n "checking for connect in -lnsl_s... " >&6; }
+if test "${ac_cv_lib_ext_nsl_s_connect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lunwind-ptrace $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
-@@ -43538,349 +11587,197 @@
+ Use char because int might match the return type of a GCC
+@@ -43888,106 +11587,131 @@
#ifdef __cplusplus
extern "C"
#endif
--char _UPT_create ();
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+char connect ();
int
main ()
{
--return _UPT_create ();
+-return $ac_func ();
+return connect ();
;
return 0;
@@ -46548,7 +46876,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_unwind_ptrace__UPT_create=yes
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_nsl_s_connect=yes;
+ ac_cv_lib_ext_nsl_s=yes
@@ -46556,7 +46884,7 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_unwind_ptrace__UPT_create=no
+- eval "$as_ac_var=no"
+ ac_cv_lib_ext_nsl_s_connect=no;
+ ac_cv_lib_ext_nsl_s=no
fi
@@ -46566,35 +46894,31 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
--$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
--if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
--
-- LIBUNWIND_PTRACE="-lunwind-ptrace";
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND_PTRACE 1
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_connect" >&5
+$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
+ if test $ac_cv_lib_ext_nsl_s_connect = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_CONNECT 1
_ACEOF
--
--else
-- LIBUNWIND_PTRACE=""
fi
+-done
+LIBS=$ac_check_lib_ext_save_LIBS
-
++
+if test $ac_cv_lib_ext_nsl_s = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL_S 1
+_ACEOF
-- LIBS=$save_LIBS
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl_s*)
+ ;;
@@ -46603,63 +46927,52 @@
+ ;;
+ 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
+-for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
-do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl" >&5
+$as_echo_n "checking for connect in -lnsl... " >&6; }
+if test "${ac_cv_lib_ext_nsl_connect+set}" = set; then :
$as_echo_n "(cached) " >&6
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
-+
+-/* 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>
+/* 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
+ #endif
+char connect ();
+int
+main ()
@@ -46668,91 +46981,33 @@
+ ;
+ return 0;
+}
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ext_nsl_connect=yes;
+ ac_cv_lib_ext_nsl=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
+ 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
++
++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
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
++
+if test $ac_cv_lib_ext_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;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_preproc=no
--fi
++_ACEOF
++
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl*)
+ ;;
@@ -46760,105 +47015,44 @@
+ 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
--$as_echo "$ac_header_preproc" >&6; }
-
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- ( cat <<\_ASBOX
--## ---------------------------------------- ##
--## Report this to samba-technical at samba.org ##
--## ---------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-
--fi
++
++
++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
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+
++
+
+-#undef $ac_func
+ { $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. */
++/* end confdefs.h. */
--#if HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
--#if HAVE_SYS_PTRACE_H
--#include <sys/ptrace.h>
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -43995,101 +11719,65 @@
+ #ifdef __cplusplus
+ extern "C"
#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
-
+char connect ();
int
main ()
{
--
-- pid_t me = (pid_t)-1;
-- ptrace(PTRACE_ATTACH, me, 0, 0);
-- ptrace(PTRACE_DETACH, me, 0, 0);
-- return 0;
--
+-return $ac_func ();
+return connect ();
;
return 0;
@@ -46885,37 +47079,20 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
--
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LINUX_PTRACE 1
--_ACEOF
--
--
+- eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ 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
--
--
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- LIBUNWIND_PTRACE=""
--
+ ac_cv_lib_ext_socket_connect=no;
+ ac_cv_lib_ext_socket=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5
+$as_echo "$ac_cv_lib_ext_socket_connect" >&6; }
+ if test $ac_cv_lib_ext_socket_connect = yes; then :
@@ -46923,13 +47100,26 @@
+#define HAVE_CONNECT 1
+_ACEOF
-+fi
+- eval "$as_ac_var=no"
+ 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
+-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
+if test $ac_cv_lib_ext_socket = yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LIBSOCKET 1
-+_ACEOF
+ _ACEOF
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lsocket*)
@@ -46938,22 +47128,23 @@
+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
++
++
+ fi
+-done
-+fi
-
-
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS"
-
-
--for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
+-for ac_func in __getcwd _getcwd
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
+$as_echo_n "checking for connect in -linet... " >&6; }
+if test "${ac_cv_lib_ext_inet_connect+set}" = set; then :
@@ -46985,7 +47176,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -43888,106 +11785,88 @@
+@@ -44097,102 +11785,88 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47073,12 +47264,12 @@
+ 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
++$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
++
+ fi
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
@@ -47102,21 +47293,19 @@
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
+-for ac_func in __xstat __fxstat __lxstat
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
+$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
+if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
@@ -47148,7 +47337,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -43995,101 +11874,65 @@
+@@ -44200,105 +11874,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47198,21 +47387,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_nsl_s_gethostbyname=no;
+ ac_cv_lib_ext_nsl_s=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_s_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; }
-+ if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETHOSTBYNAME 1
-+_ACEOF
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47224,14 +47406,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_nsl_s = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_gethostbyname" >&5
++$as_echo "$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; }
++ if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBNSL_S 1
++#define HAVE_GETHOSTBYNAME 1
_ACEOF
+ fi
+-done
++LIBS=$ac_check_lib_ext_save_LIBS
+
++if test $ac_cv_lib_ext_nsl_s = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL_S 1
++_ACEOF
+
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl_s*)
+ ;;
@@ -47239,16 +47430,15 @@
+ LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-+
-+
- fi
--done
++fi
+
+
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS"
--for ac_func in __getcwd _getcwd
+-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
@@ -47287,7 +47477,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44097,102 +11940,65 @@
+@@ -44306,107 +11940,65 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47337,21 +47527,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_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
@@ -47363,14 +47546,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_nsl = 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_LIBNSL 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
++#define HAVE_LIBNSL 1
++_ACEOF
+
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lnsl*)
+ ;;
@@ -47378,18 +47570,17 @@
+ 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 __xstat __fxstat __lxstat
+
+-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
@@ -47426,7 +47617,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44200,105 +12006,87 @@
+@@ -44414,105 +12006,87 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47532,7 +47723,7 @@
+ fi
+fi
--for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+-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
@@ -47564,10 +47755,6 @@
+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>
@@ -47576,7 +47763,11 @@
-#endif
-#undef $ac_func
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS"
+
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
+$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
+if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
@@ -47587,7 +47778,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44306,2754 +12094,2283 @@
+@@ -44520,2540 +12094,2283 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47637,14 +47828,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_ipv6_if_nametoindex=no;
+ ac_cv_lib_ext_ipv6=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- eval "$as_ac_var=no"
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
++$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
++ if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_IF_NAMETOINDEX 1
++_ACEOF
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -47656,23 +47854,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_ipv6_if_nametoindex" >&5
-+$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
-+ if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
++LIBS=$ac_check_lib_ext_save_LIBS
++
++if test $ac_cv_lib_ext_ipv6 = yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_IF_NAMETOINDEX 1
++#define HAVE_LIBIPV6 1
_ACEOF
- fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
-
-+if test $ac_cv_lib_ext_ipv6 = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBIPV6 1
-+_ACEOF
-
+ case "$LIBREPLACE_NETWORK_LIBS" in
+ *-lipv6*)
+ ;;
@@ -47680,9 +47869,10 @@
+ LIBREPLACE_NETWORK_LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS"
+ ;;
+ esac
-
-
-+fi
++
++
+ fi
+-done
+ if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
+ then
@@ -47705,13 +47895,22 @@
+#define HAVE_SOCKETPAIR 1
+_ACEOF
--for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
++fi
++done
+
+
+-for ac_func in getdents __getdents _lseek __lseek _read __read
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 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
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -47722,33 +47921,44 @@
-/* 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. */
++if test "$cross_compiling" = yes; then :
++ libreplace_cv_REPLACE_INET_NTOA=cross
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
--#endif
-+{ $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
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
+ #endif
++main() { struct in_addr ip; ip.s_addr = 0x12345678;
++if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
++ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
++exit(1);}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ libreplace_cv_REPLACE_INET_NTOA=yes
+else
++ libreplace_cv_REPLACE_INET_NTOA=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
-#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. */
@@ -47761,14 +47971,11 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
- #endif
--
+-#endif
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
++$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
+
-int
-main ()
-{
@@ -47776,10 +47983,12 @@
- ;
- return 0;
-}
-+main() { struct in_addr ip; ip.s_addr = 0x12345678;
-+if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
-+ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
-+exit(1);}
++for ac_func in inet_ntoa
++do :
++ ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
++if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_INET_NTOA 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -47803,22 +48012,24 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+ libreplace_cv_REPLACE_INET_NTOA=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+ libreplace_cv_REPLACE_INET_NTOA=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
++else
++ libreplace_cv_REPLACE_INET_NTOA=yes
fi
++done
++
++if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
++
++$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -47827,103 +48038,85 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
-+$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
+
-+for ac_func in inet_ntoa
++for ac_func in inet_aton
+do :
-+ ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
-+if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
++if test "x$ac_cv_func_inet_aton" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_INET_NTOA 1
++#define HAVE_INET_ATON 1
_ACEOF
+else
-+ libreplace_cv_REPLACE_INET_NTOA=yes
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
fi
done
-+if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
-+$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h
-
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
-+fi
-
-+for ac_func in inet_aton
++for ac_func in inet_ntop
+do :
-+ ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-+if test "x$ac_cv_func_inet_aton" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
++if test "x$ac_cv_func_inet_ntop" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_ATON 1
++#define HAVE_INET_NTOP 1
+_ACEOF
+else
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
+fi
+done
--for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
++for ac_func in inet_pton
++do :
++ ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
++if test "x$ac_cv_func_inet_pton" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_INET_PTON 1
++_ACEOF
+
+-for ac_func in getdirentries _write __write _fork __fork
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-+for ac_func in inet_ntop
-+do :
-+ ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
-+if test "x$ac_cv_func_inet_ntop" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_NTOP 1
-+_ACEOF
-+
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
-+fi
-+done
-+
-+
-+for ac_func in inet_pton
-+do :
-+ ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-+if test "x$ac_cv_func_inet_pton" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_PTON 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/inet_pton.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/inet_pton.o"
-+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
--#undef $ac_func
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+$as_echo_n "checking for getaddrinfo... " >&6; }
+if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+-#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. */
@@ -47936,15 +48129,12 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
-+#endif
+ #endif
+-
+#include <sys/socket.h>
+#include <netdb.h>
int
@@ -47999,12 +48189,29 @@
- eval "$as_ac_var=no"
+ libreplace_cv_HAVE_GETADDRINFO=no
fi
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETADDRINFO" >&5
++$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; }
++if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
++
++$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_FREEADDRINFO 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
++else
++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -48013,67 +48220,70 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++
++for ac_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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_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
++#define HAVE_IFADDRS_H 1
+ _ACEOF
--fi
--done
-+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
+ fi
++
+ done
-+$as_echo "#define HAVE_GETNAMEINFO 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 :
++
++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
++fi
-+$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
--for ac_func in getdents __getdents _lseek __lseek _read __read
+-for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
++$as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
++if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ 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
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
-#undef $ac_func
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48087,35 +48297,12 @@
- 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>
@@ -48164,13 +48351,25 @@
-
- eval "$as_ac_var=no"
+ libreplace_cv_HAVE_GETIFADDRS=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5
++$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; }
++if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
++
++$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h
++
++
++$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -48181,56 +48380,22 @@
- 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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_GETIFADDRS=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
++/* end confdefs.h. */
++
+#define HAVE_IFACE_GETIFADDRS 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48241,7 +48406,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
@@ -48251,83 +48416,32 @@
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+fi
+ fi
+-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5
+$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; }
+if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_GETIFADDRS 1" >>confdefs.h
-
--#undef $ac_func
++
+else
+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $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
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
-- 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
@@ -48347,46 +48461,40 @@
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
++fi
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_AIX" >&5
+$as_echo "$libreplace_cv_HAVE_IFACE_AIX" >&6; }
+if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_AIX 1" >>confdefs.h
- fi
--done
+fi
++fi
+-for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+if test $iface = no; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifconf" >&5
+$as_echo_n "checking for iface ifconf... " >&6; }
+if test "${libreplace_cv_HAVE_IFACE_IFCONF+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_IFCONF=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-
++
+#define HAVE_IFACE_IFCONF 1
+#define NO_CONFIG_H 1
+#define AUTOCONF_TEST 1
@@ -48397,7 +48505,9 @@
+#include "$libreplacedir/getifaddrs.c"
+#define getifaddrs_test main
+#include "$libreplacedir/test/getifaddrs.c"
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ libreplace_cv_HAVE_IFACE_IFCONF=yes
+else
@@ -48406,34 +48516,23 @@
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
-
++
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFCONF" >&5
+$as_echo "$libreplace_cv_HAVE_IFACE_IFCONF" >&6; }
+if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
+ iface=yes;
+$as_echo "#define HAVE_IFACE_IFCONF 1" >>confdefs.h
-
++
+fi
+fi
-
--for ac_func in _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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++ $as_echo_n "(cached) " >&6
++else
+
+if test "$cross_compiling" = yes; then :
+ libreplace_cv_HAVE_IFACE_IFREQ=cross
@@ -48604,9 +48703,7 @@
+LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
-+LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
-
--for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+-for ac_func in pread _pread __pread pread64 _pread64 __pread64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -48623,18 +48720,19 @@
-/* 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_OBJS="${LIBREPLACEOBJ}"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
-#undef $ac_func
@@ -48651,9 +48749,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+# add -ldl to the global LIBS
-+LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-+AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
-int
-main ()
@@ -48662,7 +48757,11 @@
- ;
- return 0;
-}
++# add -ldl to the global LIBS
++LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
++AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
+
++
+for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -48704,19 +48803,7 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+done
-+
-+for ac_header in unistd.h grp.h sys/id.h memory.h alloca.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -48724,10 +48811,9 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
+done
+
-+for ac_header in limits.h float.h libintl.h
++for ac_header in unistd.h grp.h sys/id.h memory.h alloca.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48742,7 +48828,7 @@
+
done
-+for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h
++for ac_header in limits.h float.h libintl.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48756,7 +48842,7 @@
+done
-+for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.h
++for ac_header in rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48770,7 +48856,7 @@
+done
--for ac_func in pread _pread __pread pread64 _pread64 __pread64
+-for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -48780,7 +48866,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
++for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48810,7 +48896,7 @@
+done
-#undef $ac_func
-+for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
++for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48844,7 +48930,7 @@
-}
+done
+
-+for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
++for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48885,17 +48971,7 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+done
-+
-+for ac_header in sys/sysmacros.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SYSMACROS_H 1
-+_ACEOF
-+
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -48903,10 +48979,9 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
+done
+
-+for ac_header in sys/syslog.h syslog.h
++for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -48918,36 +48993,23 @@
_ACEOF
fi
-+
- done
+-done
-+for ac_header in langinfo.h locale.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
+done
-+for ac_header in xfs/libxfs.h
++for ac_header in sys/sysmacros.h
+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_XFS_LIBXFS_H 1
++#define HAVE_SYS_SYSMACROS_H 1
+_ACEOF
+fi
+done
--for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+-for ac_func in open64 _open64 __open64 creat64
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -48957,12 +49019,14 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in netgroup.h
++for ac_header in sys/syslog.h syslog.h
+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netgroup_h" = x""yes; then :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETGROUP_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -48985,6 +49049,15 @@
+done
-#undef $ac_func
++for ac_header in langinfo.h locale.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -48998,12 +49071,8 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+for ac_header in rpcsvc/yp_prot.h
-+do :
-+ ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
-+#if HAVE_RPC_RPC_H
-+#include <rpc/rpc.h>
- #endif
+-#endif
++fi
-int
-main ()
@@ -49012,10 +49081,26 @@
- ;
- return 0;
-}
-+"
-+if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
++done
++
++for ac_header in xfs/libxfs.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
++if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_RPCSVC_YP_PROT_H 1
++#define HAVE_XFS_LIBXFS_H 1
++_ACEOF
++
++fi
++
++done
++
++for ac_header in netgroup.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
++if test "x$ac_cv_header_netgroup_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NETGROUP_H 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -49052,13 +49137,17 @@
+done
+
+
-+## These fail to compile on IRIX so just check for their presence
-+for ac_header in sys/mode.h
++for ac_header in rpcsvc/yp_prot.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 :
++ ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
++#if HAVE_RPC_RPC_H
++#include <rpc/rpc.h>
++#endif
++
++"
++if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_MODE_H 1
++#define HAVE_RPCSVC_YP_PROT_H 1
+_ACEOF
+
fi
@@ -49073,58 +49162,48 @@
+done
+
+
-+# Look for Darwin headers
-+old_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-Iinclude $CPPFLAGS"
-+for ac_header in CoreFoundation/CFStringEncodingConverter.h
++## 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" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
-+_ACEOF
-+
-+else
-+ for ac_header in CFStringEncodingConverter.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
++#define HAVE_SYS_MODE_H 1
_ACEOF
fi
--done
++
+ done
-+done
-+fi
-
-+done
-
-+CPPFLAGS="$old_CPPFLAGS"
-
--for ac_func in open64 _open64 __open64 creat64
+-for ac_func in prctl
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
--else
++# Look for Darwin headers
++old_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="-Iinclude $CPPFLAGS"
++for ac_header in CoreFoundation/CFStringEncodingConverter.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
++_ACEOF
++
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+# In valgrind 1.0.x, it's just valgrind.h. In 1.9.x+ there's a
-+# subdirectory of headers.
-+for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
++ for ac_header in CFStringEncodingConverter.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" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_CFSTRINGENCODINGCONVERTER_H 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -49132,21 +49211,42 @@
-/* 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
+done
++
++CPPFLAGS="$old_CPPFLAGS"
++
++# In valgrind 1.0.x, it's just valgrind.h. In 1.9.x+ there's a
++# subdirectory of headers.
++for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -49207,24 +49307,11 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ ac_cv_header_shadow_h=no
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test x"$ac_cv_header_shadow_h" = x"yes"; then
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--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 "#define HAVE_SHADOW_H 1" >>confdefs.h
+
+ fi
@@ -49234,26 +49321,18 @@
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
+if test "x$ac_cv_header_shadow_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++ cat >>confdefs.h <<_ACEOF
+#define HAVE_SHADOW_H 1
- _ACEOF
++_ACEOF
+- eval "$as_ac_var=no"
fi
--done
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+done
-
--for ac_func in prctl
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
++
+for ac_header in nss.h nss_common.h nsswitch.h ns_api.h sys/security.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -49262,105 +49341,9 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-+fi
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+done
-+
-+for ac_header in syscall.h sys/syscall.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-
--#undef $ac_func
-+fi
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+done
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
+
-+for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -49368,9 +49351,10 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
+done
+
-+for ac_header in sys/ea.h sys/proplist.h
++for ac_header in syscall.h sys/syscall.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49388,7 +49372,7 @@
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in sys/cdefs.h glob.h
++for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -49400,10 +49384,11 @@
-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 ()
@@ -49412,7 +49397,17 @@
- ;
- return 0;
-}
--_ACEOF
++done
++
++for ac_header in sys/ea.h sys/proplist.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -49431,16 +49426,31 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRCTL 1
--_ACEOF
++fi
++
+done
++
++
++for ac_header in sys/cdefs.h glob.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++fi
++
++done
++
+# For experimental utmp support (lastlog on some BSD-like systems)
+for ac_header in utmp.h utmpx.h lastlog.h
@@ -49966,14 +49976,15 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_lstat64=yes
-+
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then :
+ $as_echo_n "(cached) " >&6
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
+ ac_cv_c_bigendian=unknown
+ # See if we're dealing with a universal compiler.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -49983,9 +49994,20 @@
+ #endif
+ typedef int dummy;
-+_ACEOF
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
+-$as_echo "$ac_cv_func_lstat64" >&6; }
+- if test x$ac_cv_func_lstat64 = xyes ; then
+- cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LSTAT64 Whether lstat64() is available
+ _ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+- fi
+ # Check for potential -arch flags. It is not universal unless
+ # there are at least two -arch flags with different values.
+ ac_arch=
@@ -50015,19 +50037,7 @@
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/param.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 "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
--$as_echo "$ac_cv_func_lstat64" >&6; }
-- if test x$ac_cv_func_lstat64 = xyes ; then
-- cat >>confdefs.h <<\_ACEOF
--#define HAVE_LSTAT64 Whether lstat64() is available
--_ACEOF
--
-- fi
--fi
++
+int
+main ()
+{
@@ -50973,8 +50983,9 @@
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+
-+fi
+
+- ac_cv_member_struct_stat_st_umtime=no
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
+$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
+ if test $ac_cv_lib_ext_cups_httpConnectEncrypt = yes; then :
@@ -50997,10 +51008,8 @@
+ PRINT_LIBS="-lcups $PRINT_LIBS"
+ ;;
+ esac
++
-- ac_cv_member_struct_stat_st_umtime=no
--fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+ else
@@ -51483,20 +51492,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 :
@@ -51894,9 +51903,6 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
-$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
--_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
@@ -51904,20 +51910,13 @@
+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+ ;;
+esac
-
-- LIBS="-lresolv $LIBS"
-
--fi
-
++
++
++
+###############################################
+# Readline included by default unless explicitly asked not to
+test "${with_readline+set}" != "set" && with_readline=yes
-
--#
--# 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; }
@@ -51928,59 +51927,48 @@
+ 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`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
-+fi
+- LIBS="-lresolv $LIBS"
+-
+ fi
--for ac_func in putprpwnam
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+done
-+
+
+-#
+-# Check for the functions putprpwnam, set_auth_parameters,
+-# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
+-# Needed for OSF1 and HPUX.
+-#
+ for ac_header in readline/history.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_history_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_READLINE_HISTORY_H 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
++_ACEOF
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+fi
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+done
+
-+
++done
+
+
+-for ac_func in putprpwnam
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ for ac_header in readline.h readline/readline.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -51990,19 +51978,39 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-
--#undef $ac_func
++
+ for termlib in ncurses curses termcap terminfo termlib tinfo; do
+ as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
+$as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l${termlib} $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. */
+-
+-#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
@@ -53373,7 +53381,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48022,112 +15041,179 @@
+@@ -48022,213 +15041,178 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53416,21 +53424,14 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_gen_getspnam=no
+ ac_cv_lib_ext_rt_nanosleep=no;
+ ac_cv_lib_ext_rt=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-- ac_cv_lib_gen_getspnam=no
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_rt_nanosleep" >&5
-+$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
-+ if test $ac_cv_lib_ext_rt_nanosleep = yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_NANOSLEEP 1
-+_ACEOF
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -53439,14 +53440,33 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
-$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
-if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
+-
+- LIBS="-lgen $LIBS"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_rt_nanosleep" >&5
++$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; }
++ if test $ac_cv_lib_ext_rt_nanosleep = yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NANOSLEEP 1
+ _ACEOF
+
++fi
+LIBS=$ac_check_lib_ext_save_LIBS
-- LIBS="-lgen $LIBS"
+if test $ac_cv_lib_ext_rt = yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRT 1
+_ACEOF
-+
+
+-else
+-
+-
+- # getspnam was not found in libgen
+- # nothing to do here by default
+- true
+ case "$LIBS" in
+ *-lrt*)
+ ;;
@@ -53456,82 +53476,24 @@
+ esac
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+ fi
+fi
-+fi
+done
-+
+
+- ;;
+- esac
+for ac_func in utimensat
+do :
+ ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat"
+if test "x$ac_cv_func_utimensat" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_UTIMENSAT 1
- _ACEOF
-
-+fi
-+done
-
-+for ac_func in mlock munlock mlockall munlockall
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
--else
-+fi
-+done
-
-+for ac_func in memalign posix_memalign hstrerror
-+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
-
-- # getspnam was not found in libgen
-- # nothing to do here by default
-- true
-+fi
-+done
-
-+for ac_header in sys/mman.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mman_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_MMAN_H 1
-+_ACEOF
-
fi
-
-- ;;
-- esac
-+done
-+
-+# setbuffer, shmget, shm_open are needed for smbtorture
-+for ac_func in shmget shm_open
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-
- fi
done
-+for ac_func in gettext dgettext
++for ac_func in mlock munlock mlockall munlockall
+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"
@@ -53544,7 +53506,7 @@
+fi
+done
-+for ac_func in bindtextdomain textdomain
++for ac_func in memalign posix_memalign hstrerror
+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"
@@ -53567,12 +53529,12 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in strupr
++for ac_header in sys/mman.h
+do :
-+ ac_fn_c_check_func "$LINENO" "strupr" "ac_cv_func_strupr"
-+if test "x$ac_cv_func_strupr" = x""yes; then :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_mman_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUPR 1
++#define HAVE_SYS_MMAN_H 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
@@ -53586,46 +53548,32 @@
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+fi
-+done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++done
-#undef $ac_func
-+# Find a method of generating a stack trace
-+for ac_header in execinfo.h libexc.h libunwind.h
++# setbuffer, shmget, shm_open are needed for smbtorture
++for ac_func in shmget shm_open
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-+
-+fi
-+
-+done
-+
-+# libexecinfo provides backtrace_symbols on FreeBSD
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace_symbols" >&5
-+$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
-+if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -48135,100 +15221,66 @@
- #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
@@ -53633,16 +53581,24 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
-+char backtrace_symbols ();
- int
- main ()
- {
++fi
++done
+
+-int
+-main ()
+-{
-return $ac_func ();
-+return backtrace_symbols ();
- ;
- return 0;
- }
+- ;
+- return 0;
+-}
++for ac_func in gettext dgettext
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -53669,27 +53625,15 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
-+for ac_lib in '' execinfo; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_backtrace_symbols=$ac_res
fi
--
++done
+
-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
-+ if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
-+ break
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -53697,85 +53641,92 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-+done
-+if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
++for ac_func in bindtextdomain textdomain
++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
- # getspnam was found in libc or existing $LIBS
-+else
-+ ac_cv_search_backtrace_symbols=no
+-
+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace_symbols" >&5
-+$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
-+ac_res=$ac_cv_search_backtrace_symbols
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++done
-+fi
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
-+for ac_func in backtrace_symbols
++for ac_func in strupr
+do :
-+ ac_fn_c_check_func "$LINENO" "backtrace_symbols" "ac_cv_func_backtrace_symbols"
-+if test "x$ac_cv_func_backtrace_symbols" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "strupr" "ac_cv_func_strupr"
++if test "x$ac_cv_func_strupr" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_BACKTRACE_SYMBOLS 1
++#define HAVE_STRUPR 1
_ACEOF
+fi
+done
--
+
-else
--
++# Find a method of generating a stack trace
++for ac_header in execinfo.h libexc.h libunwind.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
- # getspnam was not found, try adding libsecurity
- case " $LIBS " in
- *\ -lsecurity\ *)
--
++fi
+
- # getspnam was not found and we already had libsecurity
- # nothing to do here by default
- true
--
++done
+
- ;;
- *)
- # getspnam was not found, try adding libsecurity
- { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
-$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
-if test "${ac_cv_lib_security_getspnam+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trace_back_stack in -lexc" >&5
-+$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
-+if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then :
++# libexecinfo provides backtrace_symbols on FreeBSD
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace_symbols" >&5
++$as_echo_n "checking for library containing backtrace_symbols... " >&6; }
++if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
+- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsecurity $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lexc $LIBS"
++ 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.
-@@ -48237,212 +15289,191 @@
+@@ -48237,111 +15221,67 @@
#ifdef __cplusplus
extern "C"
#endif
-char getspnam ();
-+char trace_back_stack ();
++char backtrace_symbols ();
int
main ()
{
-return getspnam ();
-+return trace_back_stack ();
++return backtrace_symbols ();
;
return 0;
}
@@ -53802,209 +53753,139 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_security_getspnam=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_exc_trace_back_stack=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_security_getspnam=no
-+ ac_cv_lib_exc_trace_back_stack=no
++for ac_lib in '' execinfo; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_backtrace_symbols=$ac_res
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
++ conftest$ac_exeext
++ if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
++ break
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
-$as_echo "$ac_cv_lib_security_getspnam" >&6; }
-if test "x$ac_cv_lib_security_getspnam" = x""yes; then
-+{ $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
-
+-
- LIBS="-lsecurity $LIBS"
-+ LIBS="-lexc $LIBS"
-
-+fi
-
+-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
-+
-+# check for sysctlbyname for BSD systems
-+for ac_func in sysctlbyname
-+do :
-+ ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
-+if test "x$ac_cv_func_sysctlbyname" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYSCTLBYNAME 1
- _ACEOF
-
-+fi
+-_ACEOF
+-
+-
+done
++if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
-
--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
-
+ else
+-
+-
- # 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
+-
++ ac_cv_search_backtrace_symbols=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace_symbols" >&5
++$as_echo "$ac_cv_search_backtrace_symbols" >&6; }
++ac_res=$ac_cv_search_backtrace_symbols
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+$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;
-+}
++for ac_func in backtrace_symbols
++do :
++ ac_fn_c_check_func "$LINENO" "backtrace_symbols" "ac_cv_func_backtrace_symbols"
++if test "x$ac_cv_func_backtrace_symbols" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_BACKTRACE_SYMBOLS 1
+_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
+ done
-+$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`
-{ $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 trace_back_stack in -lexc" >&5
++$as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
++if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lexc $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+# 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__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+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
-+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
+@@ -48349,214 +15289,192 @@
+ #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
-+#ifdef HAVE_LIBUNWIND_H
-+#include <libunwind.h>
- #endif
-
+-#endif
+-
++char trace_back_stack ();
int
main ()
{
-return $ac_func ();
-+
-+ 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 trace_back_stack ();
;
return 0;
}
@@ -54031,18 +53912,32 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_exc_trace_back_stack=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
-+if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_exc_trace_back_stack=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exc_trace_back_stack" >&5
++$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
++if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBEXC 1
++_ACEOF
++
++ LIBS="-lexc $LIBS"
-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
@@ -54050,27 +53945,33 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++
++
++# check for sysctlbyname for BSD systems
++for ac_func in sysctlbyname
++do :
++ ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
++if test "x$ac_cv_func_sysctlbyname" = 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: yes" >&5
-+$as_echo "yes" >&6; }
++#define HAVE_SYSCTLBYNAME 1
+ _ACEOF
- # getspnam was found in libc or existing $LIBS
-+$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
++fi
++done
-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
++#############################
++# check if building with gpfs
++for ac_header in gpfs_gpl.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 :
++ 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_LIBUNWIND_PTRACE_H 1
++#define HAVE_GPFS_GPL_H 1
_ACEOF
+fi
@@ -54078,49 +53979,55 @@
+done
-else
--
++if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+
- # getspnam was not found, try adding libsec
- case " $LIBS " in
- *\ -lsec\ *)
--
++$as_echo "#define HAVE_GPFS 1" >>confdefs.h
+
- # getspnam was not found and we already had libsec
- # nothing to do here by default
- true
--
++ default_shared_modules="$default_shared_modules vfs_gpfs"
++fi
+
- ;;
- *)
- # getspnam was not found, try adding libsec
- { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
-$as_echo_n "checking for getspnam in -lsec... " >&6; }
-if test "${ac_cv_lib_sec_getspnam+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _UPT_create in -lunwind-ptrace" >&5
-+$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
-+if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
+- $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"
++#############################################
++# check if building on Isilon OneFS
++printf "%s" "checking for Isilon OneFS... "
++save_LIBS="$LIBS"
++LIBS="$LIBS -lisi_version"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -48451,969 +15482,646 @@
- #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 getspnam ();
-+char _UPT_create ();
++#include <isi_version/isi_version.h>
int
main ()
{
-return getspnam ();
-+return _UPT_create ();
++get_isilon_copyright()
;
return 0;
}
@@ -54148,121 +54055,173 @@
- }; then
- ac_cv_lib_sec_getspnam=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_unwind_ptrace__UPT_create=yes
++ samba_cv_HAVE_ONEFS=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ samba_cv_HAVE_ONEFS=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++echo $samba_cv_HAVE_ONEFS
++if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
++
++$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
++
++ default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
++ default_static_modules="$default_static_modules"
++ ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
++ # Need to also add general libs for oplocks support
++ save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
++fi
++
++LIBS="$save_LIBS"
++
++# Note that all the libunwind symbols in the API are defined to internal
++# platform-specific version, so we must include libunwind.h before checking
++# any of them.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5
++$as_echo_n "checking for libunwind... " >&6; }
++save_LIBS=$LIBS
++
++UNWIND_ARCH="unknown"
++if test x"$UNAME_I" != x"unknown"; then
++ UNWIND_ARCH="$UNAME_I"
++elif test x"$UNAME_M" != x"unknown"; then
++ UNWIND_ARCH="$UNAME_M"
++elif test x"$UNAME_P" != x"unknown"; then
++ UNWIND_ARCH="$UNAME_P"
++fi
++
++case "$UNWIND_ARCH" in
++ unknown)
++ # This probably won't link without
++ # the platform-specific libunwind.
++ LIBS="$LIBS -lunwind"
++ ;;
++ i386|i586|i686)
++ # Add the platform-specific libunwind module.
++ LIBS="$LIBS -lunwind -lunwind-x86"
++ ;;
++ *)
++ # Add the platform-specific libunwind module.
++ # based on uname -i, uname -m or uname -p
++ LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
++ ;;
++esac
+
- ac_cv_lib_sec_getspnam=no
-+ ac_cv_lib_unwind_ptrace__UPT_create=no
- fi
--
+-fi
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
-$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
-if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
--
++#ifdef HAVE_LIBUNWIND_H
++#include <libunwind.h>
++#endif
+
- LIBS="-lsec $LIBS"
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
-+$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
-+if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then :
++int
++main ()
++{
++ unw_context_t ctx; unw_cursor_t cur;
++ char buf[256]; unw_word_t off;
++ unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
++ unw_get_proc_name(&cur, buf, sizeof(buf), &off);
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETSPNAM 1
--_ACEOF
-+ LIBUNWIND_PTRACE="-lunwind-ptrace";
++ ;
++ return 0;
++}
+ _ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
-+$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
- else
+-else
-
-
- # getspnam was not found in libsec
- # nothing to do here by default
- true
--
--
-+ LIBUNWIND_PTRACE=""
+
++ # 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
+
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_n "(cached) " >&6
--else
++ { $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
- 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
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lunwind-ptrace $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+done
-
+-
-#undef $ac_func
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux ptrace(2) interface" >&5
-+$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -48564,856 +15482,646 @@
+ #ifdef __cplusplus
+ extern "C"
#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
@@ -54270,20 +54229,14 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-+#if HAVE_SYS_PTRACE_H
-+#include <sys/ptrace.h>
- #endif
-
+-#endif
+-
++char _UPT_create ();
int
main ()
{
-return $ac_func ();
-+
-+ pid_t me = (pid_t)-1;
-+ ptrace(PTRACE_ATTACH, me, 0, 0);
-+ ptrace(PTRACE_DETACH, me, 0, 0);
-+ return 0;
-+
++return _UPT_create ();
;
return 0;
}
@@ -54310,17 +54263,23 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=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
-
- eval "$as_ac_var=no"
--fi
++ 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
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -54331,28 +54290,34 @@
- 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
--
-+if ac_fn_c_try_link "$LINENO"; then :
++ LIBUNWIND_PTRACE="-lunwind-ptrace";
++$as_echo "#define HAVE_LIBUNWIND_PTRACE 1" >>confdefs.h
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIGCRYPT 1
-_ACEOF
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
++
++else
++ LIBUNWIND_PTRACE=""
++fi
-+$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; }
-+ LIBUNWIND_PTRACE=""
++ LIBS=$save_LIBS
- # bigcrypt was not found and we already had libsecurity
- # nothing to do here by default
@@ -54360,7 +54325,6 @@
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+fi
- ;;
- *)
@@ -54374,34 +54338,53 @@
-LIBS="-lsecurity $LIBS"
-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
--/* end confdefs.h. */
++
++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. */
-/* 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
++#if HAVE_SYS_TYPES_H
++#include <sys/types.h>
+ #endif
-char bigcrypt ();
--int
--main ()
--{
++#if HAVE_SYS_PTRACE_H
++#include <sys/ptrace.h>
++#endif
++
+ int
+ main ()
+ {
-return bigcrypt ();
-- ;
-- return 0;
--}
+
-+for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+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
++ pid_t me = (pid_t)-1;
++ ptrace(PTRACE_ATTACH, me, 0, 0);
++ ptrace(PTRACE_DETACH, me, 0, 0);
++ return 0;
++
+ ;
+ return 0;
+ }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
@@ -54425,23 +54408,23 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_security_bigcrypt=yes
--else
++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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_security_bigcrypt=no
- 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
+-fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ LIBUNWIND_PTRACE=""
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -54451,25 +54434,16 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
-$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
-+done
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
- 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 __xstat __fxstat __lxstat
++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"
@@ -54482,7 +54456,7 @@
+fi
+done
-+for ac_func in _stat _lstat _fstat __stat __lstat __fstat
++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"
@@ -54496,7 +54470,7 @@
+fi
+done
-+for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++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"
@@ -54512,7 +54486,7 @@
+fi
+done
-+for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
++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"
@@ -54527,7 +54501,7 @@
- ;;
- esac
-+for ac_func in getdents __getdents _lseek __lseek _read __read
++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"
@@ -54540,7 +54514,7 @@
fi
done
-+for ac_func in getdirentries _write __write _fork __fork
++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"
@@ -54564,7 +54538,7 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
++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"
@@ -54594,7 +54568,7 @@
+done
-#undef $ac_func
-+for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
++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"
@@ -54627,7 +54601,7 @@
- ;
- return 0;
-}
-+for ac_func in pread _pread __pread pread64 _pread64 __pread64
++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"
@@ -54677,7 +54651,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 pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
++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"
@@ -54688,13 +54662,25 @@
_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 open64 _open64 __open64 creat64
++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"
@@ -54707,25 +54693,38 @@
+fi
+done
-+for ac_func in prctl
++for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+do :
-+ ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
-+if test "x$ac_cv_func_prctl" = x""yes; then :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_PRCTL 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-else
--
++fi
++done
+
- # bigcrypt was not found, try adding libsec
- case " $LIBS " in
- *\ -lsec\ *)
-+fi
-+done
++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
- # bigcrypt was not found and we already had libsec
- # nothing to do here by default
- true
++fi
++done
- ;;
- *)
@@ -54739,9 +54738,20 @@
-LIBS="-lsec $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++
++fi
++done
++
++
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -54980,13 +54990,21 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
--
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_func_stat64=yes
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
++$as_echo "$ac_cv_func_stat64" >&6; }
++ if test x$ac_cv_func_stat64 = xyes ; then
++
++$as_echo "#define HAVE_STAT64 1" >>confdefs.h
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_func_stat64=yes
++ fi
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -54998,55 +55016,21 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
--
-- # getprpwnam was found in libc or existing $LIBS
--
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
--_ACEOF
--
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
-+$as_echo "$ac_cv_func_stat64" >&6; }
-+ if test x$ac_cv_func_stat64 = xyes ; then
-+$as_echo "#define HAVE_STAT64 1" >>confdefs.h
-
--else
-+ fi
-+fi
-
-- # getprpwnam was not found, try adding libsecurity
-- case " $LIBS " in
-- *\ -lsecurity\ *)
+- # getprpwnam was found in libc or existing $LIBS
+if test x$ac_cv_func_lstat64 = xno ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lstat64 in <sys/stat.h>" >&5
+$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-- # getprpwnam was not found and we already had libsecurity
-- # nothing to do here by default
-- true
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+#include <sys/stat.h>
-- ;;
-- *)
-- # getprpwnam was not found, try adding libsecurity
-- { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
--$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_getprpwnam+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
+int
+main ()
+{
@@ -55055,8 +55039,6 @@
+ return 0;
+}
_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_lstat64=yes
+fi
@@ -55066,21 +55048,49 @@
+$as_echo "$ac_cv_func_lstat64" >&6; }
+ if test x$ac_cv_func_lstat64 = xyes ; then
+ $as_echo "#define HAVE_LSTAT64 Whether lstat64() is available" >>confdefs.h
-+
+
+ fi
+fi
-+
-+if test x$ac_cv_func_fstat64 = xno ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fstat64 in <sys/stat.h>" >&5
-+$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-
+-else
+-
+- # getprpwnam was not found, try adding libsecurity
+- case " $LIBS " in
+- *\ -lsecurity\ *)
+-
+- # getprpwnam was not found and we already had libsecurity
+- # nothing to do here by default
+- true
+-
+- ;;
+- *)
+- # getprpwnam was not found, try adding libsecurity
+- { $as_echo "$as_me:$LINENO: checking for getprpwnam in -lsecurity" >&5
+-$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_getprpwnam+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsecurity $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
++if test x$ac_cv_func_fstat64 = xno ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fstat64 in <sys/stat.h>" >&5
++$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
#endif
@@ -55466,9 +55476,9 @@
fi
-done
-
-
-
+
-
-for ac_func in strsignal
-do
@@ -55955,14 +55965,33 @@
-
- eval "$as_ac_var=no"
+ ac_cv_lib_security_putprpwnam=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_putprpwnam" >&5
++$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
++if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then :
++
++ LIBS="-lsecurity $LIBS"
++
++
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
++
++
++
++else
++
++
++ # putprpwnam was not found in libsecurity
++ # nothing to do here by default
++ true
++
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
@@ -55974,17 +56003,12 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_putprpwnam" >&5
-+$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
-+if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then :
+
-+ LIBS="-lsecurity $LIBS"
-+
-+
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
++ ;;
++ esac
--fi
--done
+ fi
+ done
-for ac_func in sizeof_proplist_entry
@@ -55994,10 +56018,17 @@
-$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
++
++ for ac_func in putprpwnam
++do :
++ ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
++if test "x$ac_cv_func_putprpwnam" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_PUTPRPWNAM 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -56009,17 +56040,16 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++ # putprpwnam was found in libc or existing $LIBS
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ # putprpwnam was not found in libsecurity
-+ # nothing to do here by default
-+ true
-#undef $ac_func
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -56034,7 +56064,6 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-+fi
-int
-main ()
@@ -56069,12 +56098,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ;;
-+ esac
- eval "$as_ac_var=no"
- fi
-+done
+-fi
++else
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -56087,41 +56114,24 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
-+
-+ for ac_func in putprpwnam
-+do :
-+ ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
-+if test "x$ac_cv_func_putprpwnam" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_PUTPRPWNAM 1
- _ACEOF
+-_ACEOF
++ # putprpwnam was not found, try adding libsec
++ case " $LIBS " in
++ *\ -lsec\ *)
-fi
-done
-+ # putprpwnam was found in libc or existing $LIBS
++ # putprpwnam was not found and we already had libsec
++ # nothing to do here by default
++ true
- ;;
- *)
- { $as_echo "$as_me:$LINENO: checking for library containing getxattr" >&5
-$as_echo_n "checking for library containing getxattr... " >&6; }
-if test "${ac_cv_search_getxattr+set}" = set; then
-+
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+ # putprpwnam was not found, try adding libsec
-+ case " $LIBS " in
-+ *\ -lsec\ *)
-+
-+ # putprpwnam was not found and we already had libsec
-+ # nothing to do here by default
-+ true
-+
+ ;;
+ *)
+ # putprpwnam was not found, try adding libsec
@@ -56242,10 +56252,10 @@
fi
+done
-+
-+
-+
-+
+
+
+
+
+ for ac_func in set_auth_parameters
+do :
+ ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
@@ -56253,14 +56263,14 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SET_AUTH_PARAMETERS 1
+_ACEOF
-
++
+ # set_auth_parameters was found in libc or existing $LIBS
-
-
++
++
+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
++
-
-for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -56364,11 +56374,11 @@
-
- eval "$as_ac_var=no"
+ ac_cv_lib_security_set_auth_parameters=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_set_auth_parameters" >&5
+$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
+if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then :
@@ -56529,11 +56539,11 @@
-
- eval "$as_ac_var=no"
+ ac_cv_lib_sec_set_auth_parameters=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_set_auth_parameters" >&5
+$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
+if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then :
@@ -57081,21 +57091,11 @@
-fi
-done
+ # bigcrypt was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
-+
-+else
++$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
-+ # bigcrypt was not found, try adding libsecurity
-+ case " $LIBS " in
-+ *\ -lsecurity\ *)
-+ # bigcrypt was not found and we already had libsecurity
-+ # nothing to do here by default
-+ true
-for ac_func in attr_get attr_list attr_set attr_remove
-do
@@ -57103,23 +57103,14 @@
-{ $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
-+ ;;
-+ *)
-+ # bigcrypt was not found, try adding libsecurity
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsecurity" >&5
-+$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_bigcrypt+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsecurity $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
@@ -57128,14 +57119,33 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++ # bigcrypt was not found, try adding libsecurity
++ case " $LIBS " in
++ *\ -lsecurity\ *)
+
-#undef $ac_func
++ # bigcrypt was not found and we already had libsecurity
++ # nothing to do here by default
++ true
++
++ ;;
++ *)
++ # bigcrypt was not found, try adding libsecurity
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsecurity" >&5
++$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_bigcrypt+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsecurity $LIBS"
++cat 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
@@ -57525,13 +57535,13 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
++ ac_cv_lib_security_getprpwnam=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ ac_cv_lib_security_getprpwnam=no
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -57934,10 +57944,10 @@
- eval "$as_ac_var=no"
+else
+ ac_cv_search_getproplist=no
- fi
++fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
-+fi
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getproplist" >&5
+$as_echo "$ac_cv_search_getproplist" >&6; }
+ac_res=$ac_cv_search_getproplist
@@ -58146,12 +58156,25 @@
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
++
++fi
++done
++
++ for ac_func in flistxattr removexattr lremovexattr fremovexattr
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
- eval "$as_ac_var=no"
fi
+done
+
-+ for ac_func in flistxattr removexattr lremovexattr fremovexattr
++ for ac_func in setxattr lsetxattr fsetxattr
+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"
@@ -58174,19 +58197,6 @@
- if test "x$as_val" = x""yes; then
+done
+
-+ for ac_func in setxattr lsetxattr fsetxattr
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
+ for ac_func in attr_get attr_list attr_set attr_remove
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58335,21 +58345,28 @@
+ smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
+
+- eval "$as_ac_var=no"
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $smb_attr_cv_xattr_add_opt" >&5
+$as_echo "$smb_attr_cv_xattr_add_opt" >&6; }
+ if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
-- eval "$as_ac_var=no"
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+$as_echo "#define XATTR_ADD_OPT 1" >>confdefs.h
+
+ fi
fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+-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
++
+# Check if we have extattr
+case "$host_os" in
+ *freebsd4* | *dragonfly* )
@@ -58368,14 +58385,7 @@
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$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
+done
+
+ for ac_func in extattr_get_fd extattr_get_file extattr_get_link
@@ -59345,7 +59355,7 @@
pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
else
pkg_failed=yes
-@@ -52415,21 +18604,17 @@
+@@ -52415,768 +18604,112 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBTALLOC_PKG_ERRORS" >&5
@@ -59366,23 +59376,25 @@
- { { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
-$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "Unable to find libtalloc" "$LINENO" 5
- else
- enable_external_libtalloc=no
- fi
-@@ -52437,7 +18622,7 @@
- else
- LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
- LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
+- else
+- enable_external_libtalloc=no
+- fi
+-
+-else
+- LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
+- LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- enable_external_libtalloc=yes
- fi
-@@ -52449,734 +18634,82 @@
- tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
- for d in $tallocpaths; do
- if test -f "$srcdir/$d/talloc.c"; then
+-$as_echo "yes" >&6; }
+- enable_external_libtalloc=yes
+-fi
+-fi
+-
+-if test "x$enable_external_libtalloc" = xno
+-then
+- tallocdir=""
+-tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
+-for d in $tallocpaths; do
+- if test -f "$srcdir/$d/talloc.c"; then
- tallocdir="$d"
-
- break;
@@ -59845,16 +59857,34 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
--else
++ as_fn_error "Unable to find libtalloc" "$LINENO" 5
++ else
++ enable_external_libtalloc=no
++ fi
++
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
++ LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ enable_external_libtalloc=yes
++fi
++fi
+
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
++if test "x$enable_external_libtalloc" = xno
++then
++ tallocdir=""
++tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
++for d in $tallocpaths; do
++ if test -f "$srcdir/$d/talloc.c"; then
+ tallocdir="$d"
+
+ break;
@@ -61225,11 +61255,11 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
+-fi
+ ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = x""yes; then :
--fi
--
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
@@ -61260,7 +61290,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -54603,260 +19620,134 @@
+@@ -54603,190 +19620,97 @@
return 0;
}
_ACEOF
@@ -61403,8 +61433,8 @@
/* end confdefs.h. */
#include <stdio.h>
#include <sys/stat.h>
- main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
- _ACEOF
+-main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -61427,6 +61457,8 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
++main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
samba_cv_SIZEOF_OFF_T=yes
else
@@ -61479,12 +61511,10 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <stdio.h>
--#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
+@@ -54796,67 +19720,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
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -61507,12 +61537,6 @@
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+#include <unistd.h>
-+#endif
-+#include <stdio.h>
-+#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
+if ac_fn_c_try_run "$LINENO"; then :
samba_cv_HAVE_OFF64_T=yes
else
@@ -63166,13 +63190,11 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_READDIR_NAME 1
-_ACEOF
-+$as_echo "#define HAVE_BROKEN_READDIR_NAME 1" >>confdefs.h
-
- fi
-
+-
+-fi
+-
-{ $as_echo "$as_me:$LINENO: checking for utimbuf" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5
- $as_echo_n "checking for utimbuf... " >&6; }
+-$as_echo_n "checking for utimbuf... " >&6; }
-if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
@@ -63247,9 +63269,8 @@
-{ $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 "${samba_cv_HAVE_UTIMBUF+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -63287,14 +63308,29 @@
-choke me
-#endif
-
--int
--main ()
--{
++$as_echo "#define HAVE_BROKEN_READDIR_NAME 1" >>confdefs.h
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5
++$as_echo_n "checking for utimbuf... " >&6; }
++if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <utime.h>
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -63317,26 +63353,13 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ samba_cv_HAVE_UTIMBUF=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- eval "$as_ac_var=no"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <utime.h>
-+int
-+main ()
-+{
-+struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_HAVE_UTIMBUF=yes
-+else
+ samba_cv_HAVE_UTIMBUF=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -64886,7 +64909,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -58255,325 +21639,63 @@
+@@ -58255,204 +21639,36 @@
}
_ACEOF
@@ -64934,24 +64957,27 @@
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&5
$as_echo "$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" >&6; }
--if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
--
+ if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KERNEL_CHANGE_NOTIFY 1
-_ACEOF
--
--fi
--
++$as_echo "#define HAVE_KERNEL_CHANGE_NOTIFY 1" >>confdefs.h
+
+ fi
+
-{ $as_echo "$as_me:$LINENO: checking for inotify support" >&5
--$as_echo_n "checking for inotify support... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify support" >&5
+ $as_echo_n "checking for inotify support... " >&6; }
-if test "${samba_cv_HAVE_INOTIFY+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "${samba_cv_HAVE_INOTIFY+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
-
-
-
--
--for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
+ for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -65093,15 +65119,20 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++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
+@@ -58460,120 +21676,26 @@
+ fi
+
+ done
-
--fi
-
--done
--
--
-for ac_func in inotify_init
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -65180,33 +65211,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
-+
-+$as_echo "#define HAVE_KERNEL_CHANGE_NOTIFY 1" >>confdefs.h
-
+-
- eval "$as_ac_var=no"
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify support" >&5
-+$as_echo_n "checking for inotify support... " >&6; }
-+if test "${samba_cv_HAVE_INOTIFY+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+for ac_header in linux/inotify.h asm/unistd.h sys/inotify.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -65215,8 +65227,6 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+
-+done
-+
+for ac_func in inotify_init
+do :
+ ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
@@ -66971,11 +66981,12 @@
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
++else
+ samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
fi
-
@@ -68293,7 +68304,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -61571,385 +23118,114 @@
+@@ -61571,67 +23118,34 @@
#endif
}
_ACEOF
@@ -68351,36 +68362,29 @@
fi
fi
--
--# glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
+
+ # glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
-{ $as_echo "$as_me:$LINENO: checking for broken posix_fallocate" >&5
--$as_echo_n "checking for broken posix_fallocate... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken posix_fallocate" >&5
+ $as_echo_n "checking for broken posix_fallocate... " >&6; }
-if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
--
++if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
-- #define _XOPEN_SOURCE 600
-- #include <stdlib.h>
-- #if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4))
-- probably broken posix_fallocate
-- #endif
--
--int
--main ()
--{
--
--
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 600
+@@ -61649,56 +23163,29 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -68399,50 +68403,52 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
--fi
++ samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
+ fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
--$as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
--if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
+ $as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
+ if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_POSIX_FALLOCATE /**/
-_ACEOF
--
--fi
--
--
++$as_echo "#define HAVE_BROKEN_POSIX_FALLOCATE /**/" >>confdefs.h
+
+ fi
+
+
-{ $as_echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
--$as_echo_n "checking for st_blocks in struct stat... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
+ $as_echo_n "checking for st_blocks in struct stat... " >&6; }
-if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
--
++if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <unistd.h>
--int
--main ()
--{
--struct stat st; st.st_blocks = 0;
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -61711,141 +23198,24 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -68461,20 +68467,23 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- samba_cv_HAVE_STAT_ST_BLOCKS=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+ samba_cv_HAVE_STAT_ST_BLOCKS=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_STAT_ST_BLOCKS=no
--fi
++ samba_cv_HAVE_STAT_ST_BLOCKS=no
+ fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
--$as_echo "$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
--if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
+ $as_echo "$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
+ if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT_ST_BLOCKS 1
-_ACEOF
@@ -68570,59 +68579,48 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--
--fi
--
++$as_echo "#define HAVE_STAT_ST_BLOCKS 1" >>confdefs.h
+
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blksize_t" >&5
-$as_echo "$ac_cv_type_blksize_t" >&6; }
-if test "x$ac_cv_type_blksize_t" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_BLKSIZE_T 1
--_ACEOF
--
--
--fi
++ac_fn_c_check_type "$LINENO" "blksize_t" "ac_cv_type_blksize_t" "#include <sys/stat.h>
++"
++if test "x$ac_cv_type_blksize_t" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_BLKSIZE_T 1
+@@ -61853,103 +23223,9 @@
+
+
+ fi
-{ $as_echo "$as_me:$LINENO: checking for blkcnt_t" >&5
-$as_echo_n "checking for blkcnt_t... " >&6; }
-if test "${ac_cv_type_blkcnt_t+set}" = set; then
-+
-+# glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken posix_fallocate" >&5
-+$as_echo_n "checking for broken posix_fallocate... " >&6; }
-+if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_type_blkcnt_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <sys/stat.h>
-+
-+ #define _XOPEN_SOURCE 600
-+ #include <stdlib.h>
-+ #if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4))
-+ probably broken posix_fallocate
-+ #endif
-
- int
- main ()
- {
+-
+-int
+-main ()
+-{
-if (sizeof (blkcnt_t))
- return 0;
-+
-+
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -68646,44 +68644,18 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
-+else
-+ samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
-+$as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
-+if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
-+
-+$as_echo "#define HAVE_BROKEN_POSIX_FALLOCATE /**/" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
-+$as_echo_n "checking for st_blocks in struct stat... " >&6; }
-+if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+#include <sys/types.h>
- #include <sys/stat.h>
+-/* end confdefs.h. */
+-#include <sys/stat.h>
-
-+#include <unistd.h>
- int
- main ()
- {
+-int
+-main ()
+-{
-if (sizeof ((blkcnt_t)))
- return 0;
-+struct stat st; st.st_blocks = 0;
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -68703,40 +68675,23 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ samba_cv_HAVE_STAT_ST_BLOCKS=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_blkcnt_t=yes
-+ samba_cv_HAVE_STAT_ST_BLOCKS=no
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_STAT_ST_BLOCKS" >&5
-+$as_echo "$samba_cv_HAVE_STAT_ST_BLOCKS" >&6; }
-+if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
-
-+$as_echo "#define HAVE_STAT_ST_BLOCKS 1" >>confdefs.h
-
- fi
-
+-
+-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_fn_c_check_type "$LINENO" "blksize_t" "ac_cv_type_blksize_t" "#include <sys/stat.h>
-+"
-+if test "x$ac_cv_type_blksize_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_BLKSIZE_T 1
-+_ACEOF
-+
-+
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blkcnt_t" >&5
-$as_echo "$ac_cv_type_blkcnt_t" >&6; }
-if test "x$ac_cv_type_blkcnt_t" = x""yes; then
@@ -70626,13 +70581,10 @@
/* 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. */
-@@ -63991,60 +24428,32 @@
- {
- return ldap_add_result_entry ();
- ;
-- return 0;
--}
--_ACEOF
+@@ -63994,57 +24431,29 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -70654,9 +70606,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_ext_ldap_add_result_entry=yes
else
@@ -70868,11 +70817,53 @@
$as_echo "no" >&6; }
fi
fi
-@@ -64301,151 +24710,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
+@@ -64259,193 +24668,54 @@
+ KRB5_LIBS=$ac_new_flags
+
+
+- ac_new_flags=""
+- l=""
+- for i in $KRB5_LDFLAGS; do
+- case $l$i in
+- -L/usr/lib) ;;
+- -L/usr/lib/) ;;
+- -L/usr/lib64) ;;
+- -L/usr/lib64/) ;;
+- -Wl,-rpath,/usr/lib) l="";;
+- -Wl,-rpath,/usr/lib/) l="";;
+- -Wl,-rpath,/usr/lib64) l="";;
+- -Wl,-rpath,/usr/lib64/) l="";;
+- -Wl,-rpath) l=$i;;
+- -Wl,-rpath-Wl,/usr/lib) l="";;
+- -Wl,-rpath-Wl,/usr/lib/) l="";;
+- -Wl,-rpath-Wl,/usr/lib64) l="";;
+- -Wl,-rpath-Wl,/usr/lib64/) l="";;
+- *)
+- s=" "
+- if test x"$ac_new_flags" = x""; then
+- s="";
+- fi
+- if test x"$l" = x""; then
+- ac_new_flags="$ac_new_flags$s$i";
+- else
+- ac_new_flags="$ac_new_flags$s$l $i";
+- fi
+- l=""
+- ;;
+- esac
+- done
+- KRB5_LDFLAGS=$ac_new_flags
-
+- CFLAGS="$KRB5_CFLAGS $CFLAGS"
+- CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
+- LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
+-
+- KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
+-
+- # 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
+-
-for ac_header in krb5.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -70968,7 +70959,39 @@
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++ ac_new_flags=""
++ l=""
++ for i in $KRB5_LDFLAGS; do
++ case $l$i in
++ -L/usr/lib) ;;
++ -L/usr/lib/) ;;
++ -L/usr/lib64) ;;
++ -L/usr/lib64/) ;;
++ -Wl,-rpath,/usr/lib) l="";;
++ -Wl,-rpath,/usr/lib/) l="";;
++ -Wl,-rpath,/usr/lib64) l="";;
++ -Wl,-rpath,/usr/lib64/) l="";;
++ -Wl,-rpath) l=$i;;
++ -Wl,-rpath-Wl,/usr/lib) l="";;
++ -Wl,-rpath-Wl,/usr/lib/) l="";;
++ -Wl,-rpath-Wl,/usr/lib64) l="";;
++ -Wl,-rpath-Wl,/usr/lib64/) l="";;
++ *)
++ s=" "
++ if test x"$ac_new_flags" = x""; then
++ s="";
++ fi
++ if test x"$l" = x""; then
++ ac_new_flags="$ac_new_flags$s$i";
++ else
++ ac_new_flags="$ac_new_flags$s$l $i";
++ fi
++ l=""
++ ;;
++ esac
++ done
++ KRB5_LDFLAGS=$ac_new_flags
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -71010,11 +71033,19 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
++ CFLAGS="$KRB5_CFLAGS $CFLAGS"
++ CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
++ LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++ KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
++
++ # 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
+ for ac_header in krb5.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
@@ -75003,16 +75034,10 @@
/* 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. */
-@@ -69456,49 +28028,24 @@
-
- int
- main ()
--{
--return krb5_get_init_creds_opt_free ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -69462,43 +28034,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -75034,12 +75059,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+{
-+return krb5_get_init_creds_opt_free ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_ext_krb5_get_init_creds_opt_free=yes
else
@@ -75089,10 +75108,19 @@
/* 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. */
-@@ -69560,43 +28101,18 @@
- return 0;
- }
- _ACEOF
+@@ -69551,52 +28092,27 @@
+ #if defined __stub_krb5_get_init_creds_opt_get_error || defined __stub___krb5_get_init_creds_opt_get_error
+ choke me
+ #endif
+-
+-int
+-main ()
+-{
+-return krb5_get_init_creds_opt_get_error ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -75114,6 +75142,15 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++
++int
++main ()
++{
++return krb5_get_init_creds_opt_get_error ();
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_ext_krb5_get_init_creds_opt_get_error=yes
else
@@ -75952,16 +75989,16 @@
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
+-_ACEOF
+-
+-
+-else
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 0
+#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE $ac_have_decl
_ACEOF
--else
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 0
--_ACEOF
--
--
-fi
-
-
@@ -77192,12 +77229,10 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -71800,58 +29407,31 @@
- krb5_keyusage usage = KRB5_KU_OTHER_CKSUM;
- ;
+@@ -71802,56 +29409,29 @@
return 0;
--}
--_ACEOF
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -77216,8 +77251,6 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+}
-+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
samba_cv_HAVE_KRB5_KU_OTHER_CKSUM=yes
else
@@ -79241,7 +79274,7 @@
;;
esac
;;
-@@ -73827,210 +30526,70 @@
+@@ -73827,18 +30526,16 @@
case "$host_os" in
*linux*)
if test x"$use_ads" != x"yes"; then
@@ -79264,13 +79297,14 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
- UNINSTALL_CIFSUPCALL="uninstallcifsupcall"
+@@ -73846,191 +30543,53 @@
fi
;;
-- *)
+ *)
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-- ;;
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ ;;
- esac
-
-fi
@@ -79359,19 +79393,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ *)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ ;;
-+ esac
-
+-
- ac_header_compiler=no
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -79404,22 +79433,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ esac
- ac_header_preproc=no
--fi
-+#################################################
-+# Check for a PAM clear-text auth, accounts, password
-+# and session support. Most PAM implementations keep their
-+# headers in /usr/include/security. Darwin keeps its in
-+# /usr/include/pam.
+ fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-+with_pam_for_crypt=no
-+try_pam=auto
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try PAM support" >&5
-+$as_echo_n "checking whether to try PAM support... " >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -79449,6 +79470,18 @@
-## ---------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
++
++#################################################
++# Check for a PAM clear-text auth, accounts, password
++# and session support. Most PAM implementations keep their
++# headers in /usr/include/security. Darwin keeps its in
++# /usr/include/pam.
++
++with_pam_for_crypt=no
++try_pam=auto
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try PAM support" >&5
++$as_echo_n "checking whether to try PAM support... " >&6; }
++
+# Check whether --with-pam was given.
+if test "${with_pam+set}" = set; then :
+ withval=$with_pam; case "$withval" in
@@ -80512,39 +80545,38 @@
$as_echo "no" >&6; }
samba_cv_TRY_SYS_QUOTAS=no
;;
-@@ -75089,636 +31174,82 @@
- *linux*)
- samba_cv_SYSQUOTA_FOUND=yes
+@@ -75084,641 +31169,87 @@
+ # only check for quota stuff if --with-quotas
+ if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then
+-case "$host_os" in
+- # on linux we didn't need to test we have builtin support
+- *linux*)
+- samba_cv_SYSQUOTA_FOUND=yes
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_QUOTACTL_LINUX 1
-_ACEOF
-+$as_echo "#define HAVE_QUOTACTL_LINUX 1" >>confdefs.h
-
- samba_cv_sysquotas_file="lib/sysquotas_linux.c"
+-
+- samba_cv_sysquotas_file="lib/sysquotas_linux.c"
- { $as_echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
- $as_echo_n "checking whether to use the lib/sysquotas_linux.c builtin support... " >&6; }
+-$as_echo_n "checking whether to use the lib/sysquotas_linux.c builtin support... " >&6; }
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
-
+-$as_echo "yes" >&6; }
+-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINUX_XFS_QUOTAS 1
-_ACEOF
-+$as_echo "#define HAVE_LINUX_XFS_QUOTAS 1" >>confdefs.h
-
- samba_cv_found_xfs_header=yes
+-
+- samba_cv_found_xfs_header=yes
- { $as_echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
- $as_echo_n "checking whether to use the lib/sysquotas_xfs.c builtin support... " >&6; }
+-$as_echo_n "checking whether to use the lib/sysquotas_xfs.c builtin support... " >&6; }
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- ;;
- *solaris*)
- # need to set this define when using static linking (BUG 1473)
+-$as_echo "yes" >&6; }
+- ;;
+- *solaris*)
+- # need to set this define when using static linking (BUG 1473)
- CPPFLAGS="$CPPFLAGS -DSUNOS5"
- ;;
- *)
@@ -80943,21 +80975,23 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ CPPFLAGS="$CPPFLAGS -DSUNOS5"
-+ ;;
-+ *)
-+ ;;
-+esac
++case "$host_os" in
++ # on linux we didn't need to test we have builtin support
++ *linux*)
++ samba_cv_SYSQUOTA_FOUND=yes
- ac_header_preproc=no
-fi
-+# some broken header files need this
-+ac_fn_c_check_header_mongrel "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
-+if test "x$ac_cv_header_asm_types_h" = x""yes; then :
++$as_echo "#define HAVE_QUOTACTL_LINUX 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; }
++ samba_cv_sysquotas_file="lib/sysquotas_linux.c"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
++$as_echo_n "checking whether to use the lib/sysquotas_linux.c builtin support... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -80988,7 +81022,22 @@
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
--esac
++
++$as_echo "#define HAVE_LINUX_XFS_QUOTAS 1" >>confdefs.h
++
++ samba_cv_found_xfs_header=yes
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
++$as_echo_n "checking whether to use the lib/sysquotas_xfs.c builtin support... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ ;;
++ *solaris*)
++ # need to set this define when using static linking (BUG 1473)
++ CPPFLAGS="$CPPFLAGS -DSUNOS5"
++ ;;
++ *)
++ ;;
+ esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -81000,7 +81049,6 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+$as_echo "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
@@ -81009,15 +81057,18 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-+ cat >> confdefs.h <<\EOF
-+#include <asm/types.h>
-+EOF
++# some broken header files need this
++ac_fn_c_check_header_mongrel "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
++if test "x$ac_cv_header_asm_types_h" = x""yes; then :
-fi
-done
-+fi
++$as_echo "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
++ cat >> confdefs.h <<\EOF
++#include <asm/types.h>
++EOF
-# For sys/quota.h and linux/quota.h
@@ -81029,7 +81080,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
@@ -81046,6 +81097,9 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
++
++
++
+# For quotas on Veritas VxFS filesystems
+for ac_header in sys/fs/vx_quota.h
+do :
@@ -82463,13 +82517,14 @@
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
fu_cv_sys_stat_statvfs64=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
-
-( exit $ac_status )
-fu_cv_sys_stat_statvfs64=no
++else
+ fu_cv_sys_stat_statvfs64=no
fi
-rm -rf conftest.dSYM
@@ -82513,12 +82568,10 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -77074,49 +31874,22 @@
- struct statvfs fsd; statvfs (0, &fsd);
- ;
+@@ -77076,47 +31876,20 @@
return 0;
--}
--_ACEOF
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -82540,8 +82593,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
fu_cv_sys_stat_statvfs=yes
else
@@ -83400,11 +83451,11 @@
-- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
- $as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
--if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then
-+if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then :
+- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
+ $as_echo_n "checking for CTDB_CONTROL_TRANS3_COMMIT declaration... " >&6; }
+-if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+set}" = set; then
++if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -83440,99 +83491,32 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
+ ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
-+ ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
+- ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=no
++ ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
- $as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&6; }
- if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&5
+ $as_echo "$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&6; }
+ if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1
+-#define HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL 1
-_ACEOF
-+$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1" >>confdefs.h
++$as_echo "#define HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL 1" >>confdefs.h
fi
-@@ -78008,17 +32406,13 @@
+@@ -78008,255 +32406,43 @@
fi
-
-- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_ACTIVE declaration" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS2_ACTIVE declaration" >&5
- $as_echo_n "checking for CTDB_CONTROL_TRANS2_ACTIVE declaration... " >&6; }
--if test "${ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl+set}" = set; then
-+if test "${ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- #include "confdefs.h"
-@@ -78039,41 +32433,18 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=no
-+ ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&5
- $as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" >&6; }
- if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_ACTIVE_decl" = x"yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL 1
--_ACEOF
-+$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL 1" >>confdefs.h
-
- fi
-
-@@ -78084,255 +32455,43 @@
- fi
-
# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
-{ $as_echo "$as_me:$LINENO: checking for struct ctdb_tcp_client" >&5
-$as_echo_n "checking for struct ctdb_tcp_client... " >&6; }
@@ -83802,7 +83786,7 @@
else
-@@ -78342,139 +32501,33 @@
+@@ -78266,139 +32452,33 @@
fi
@@ -83952,7 +83936,7 @@
withval=$with_cluster_support;
fi
-@@ -78485,44 +32538,38 @@
+@@ -78409,44 +32489,38 @@
if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
if test "x$with_cluster_support" = "xyes"; then
@@ -84004,7 +83988,7 @@
withval=$with_acl_support; case "$withval" in
yes|no)
with_acl_support="$withval"
-@@ -78535,105 +32582,85 @@
+@@ -78459,105 +32533,85 @@
with_acl_support="auto"
fi
@@ -84131,7 +84115,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78651,60 +32678,31 @@
+@@ -78575,60 +32629,31 @@
return 0;
}
_ACEOF
@@ -84201,7 +84185,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78722,61 +32720,32 @@
+@@ -78646,61 +32671,32 @@
return 0;
}
_ACEOF
@@ -84272,7 +84256,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -78795,64 +32764,33 @@
+@@ -78719,64 +32715,33 @@
return 0;
}
_ACEOF
@@ -84347,7 +84331,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -78870,58 +32808,29 @@
+@@ -78794,58 +32759,29 @@
return 0;
}
_ACEOF
@@ -84414,7 +84398,7 @@
fi
;;
-@@ -78933,31 +32842,27 @@
+@@ -78857,31 +32793,27 @@
#################################################
# check for AIO support
@@ -84452,7 +84436,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78975,58 +32880,29 @@
+@@ -78899,58 +32831,29 @@
return 0;
}
_ACEOF
@@ -84520,7 +84504,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79044,59 +32920,30 @@
+@@ -78968,59 +32871,30 @@
return 0;
}
_ACEOF
@@ -84589,7 +84573,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -79108,55 +32955,26 @@
+@@ -79032,55 +32906,26 @@
return 0;
}
_ACEOF
@@ -84653,7 +84637,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -79168,716 +32986,317 @@
+@@ -79092,716 +32937,317 @@
return 0;
}
_ACEOF
@@ -85508,7 +85492,7 @@
$as_echo "no" >&6; }
fi
-@@ -79894,30 +33313,26 @@
+@@ -79818,30 +33264,26 @@
# check for sendfile support
with_sendfile_support=yes
@@ -85545,7 +85529,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -79933,53 +33348,24 @@
+@@ -79857,53 +33299,24 @@
return 0;
}
_ACEOF
@@ -85607,7 +85591,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -79995,54 +33381,25 @@
+@@ -79919,54 +33332,25 @@
return 0;
}
_ACEOF
@@ -85670,7 +85654,7 @@
/* end confdefs.h. */
\
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -80062,103 +33419,58 @@
+@@ -79986,103 +33370,58 @@
return 0;
}
_ACEOF
@@ -85791,7 +85775,7 @@
/* end confdefs.h. */
\
#include <sys/types.h>
-@@ -80185,76 +33497,41 @@
+@@ -80109,76 +33448,41 @@
return 0;
}
_ACEOF
@@ -85880,7 +85864,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -80278,73 +33555,38 @@
+@@ -80202,73 +33506,38 @@
return 0;
}
_ACEOF
@@ -85966,7 +85950,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -80368,77 +33610,41 @@
+@@ -80292,77 +33561,41 @@
return 0;
}
_ACEOF
@@ -86056,7 +86040,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80456,43 +33662,18 @@
+@@ -80380,43 +33613,18 @@
return 0;
}
_ACEOF
@@ -86106,7 +86090,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSENDFILE 1
_ACEOF
-@@ -80501,17 +33682,13 @@
+@@ -80425,17 +33633,13 @@
fi
@@ -86127,7 +86111,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -80542,74 +33719,39 @@
+@@ -80466,74 +33670,39 @@
return 0;
}
_ACEOF
@@ -86214,7 +86198,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -80640,75 +33782,40 @@
+@@ -80564,75 +33733,40 @@
return 0;
}
_ACEOF
@@ -86302,7 +86286,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -80736,59 +33843,28 @@
+@@ -80660,59 +33794,28 @@
return 0;
}
_ACEOF
@@ -86371,7 +86355,7 @@
$as_echo "no" >&6; };
fi
;;
-@@ -80797,12 +33873,12 @@
+@@ -80721,12 +33824,12 @@
esac
;;
*)
@@ -86386,7 +86370,7 @@
$as_echo "yes" >&6; }
fi
-@@ -80811,17 +33887,13 @@
+@@ -80735,17 +33838,13 @@
############################################
# See if we have the Linux readahead syscall.
@@ -86407,7 +86391,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -80836,62 +33908,31 @@
+@@ -80760,62 +33859,31 @@
return 0;
}
_ACEOF
@@ -86479,7 +86463,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -80902,41 +33943,18 @@
+@@ -80826,41 +33894,18 @@
return 0;
}
_ACEOF
@@ -86525,7 +86509,7 @@
fi
-@@ -80944,17 +33962,13 @@
+@@ -80868,17 +33913,13 @@
############################################
# See if we have the posix_fadvise syscall.
@@ -86546,7 +86530,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -80969,47 +33983,20 @@
+@@ -80893,47 +33934,20 @@
return 0;
}
_ACEOF
@@ -86573,11 +86557,12 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
samba_cv_HAVE_POSIX_FADVISE=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- samba_cv_HAVE_POSIX_FADVISE=no
++else
+ samba_cv_HAVE_POSIX_FADVISE=no
fi
-
@@ -86600,7 +86585,7 @@
fi
-@@ -81018,17 +34005,13 @@
+@@ -80942,17 +33956,13 @@
case "$host_os" in
*linux*)
@@ -86621,7 +86606,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -81043,40 +34026,15 @@
+@@ -80967,40 +33977,15 @@
return 0;
}
_ACEOF
@@ -86667,7 +86652,7 @@
$as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
;;
*)
-@@ -81086,24 +34044,18 @@
+@@ -81010,24 +33995,18 @@
if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
@@ -86696,7 +86681,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -81114,41 +34066,18 @@
+@@ -81038,41 +34017,18 @@
return 0;
}
_ACEOF
@@ -86742,7 +86727,7 @@
fi
-@@ -81156,68 +34085,35 @@
+@@ -81080,68 +34036,35 @@
############################################
# See if we have the a broken readlink syscall.
@@ -86821,7 +86806,7 @@
fi
-@@ -81225,7 +34121,7 @@
+@@ -81149,7 +34072,7 @@
# Check whether winbind is supported on this platform. If so we need to
# build and install client programs, sbin programs and shared libraries
@@ -86830,7 +86815,7 @@
$as_echo_n "checking whether to build winbind... " >&6; }
# Initially, the value of $host_os decides whether winbind is supported
-@@ -81237,7 +34133,7 @@
+@@ -81161,7 +34084,7 @@
# We define this here so --with-winbind can override it.
# Check whether --with-wbclient was given.
@@ -86839,7 +86824,7 @@
withval=$with_wbclient;
case "$withval" in
no)
-@@ -81335,7 +34231,7 @@
+@@ -81259,7 +34182,7 @@
# Check whether --with-winbind was given.
@@ -86848,7 +86833,7 @@
withval=$with_winbind;
case "$withval" in
yes)
-@@ -81366,18 +34262,14 @@
+@@ -81290,18 +34213,14 @@
WINBIND_WINS_NSS=""
fi
if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -86870,7 +86855,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -81395,57 +34287,28 @@
+@@ -81319,57 +34238,28 @@
return 0;
}
_ACEOF
@@ -86937,7 +86922,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
else
-@@ -81474,12 +34337,10 @@
+@@ -81398,12 +34288,10 @@
fi
if test x"$HAVE_WINBIND" = x"yes"; then
@@ -86952,7 +86937,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -81490,7 +34351,7 @@
+@@ -81414,7 +34302,7 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
else
@@ -86961,7 +86946,7 @@
$as_echo "no$winbind_no_reason" >&6; }
fi
-@@ -81503,108 +34364,11 @@
+@@ -81427,108 +34315,11 @@
# Solaris 10 does have new member in nss_XbyY_key
@@ -87074,7 +87059,7 @@
fi
-@@ -81612,318 +34376,29 @@
+@@ -81536,318 +34327,29 @@
# Solaris has some extra fields in struct passwd that need to be
# initialised otherwise nscd crashes.
@@ -87404,7 +87389,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-@@ -81932,104 +34407,9 @@
+@@ -81856,104 +34358,9 @@
fi
@@ -87512,7 +87497,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -82039,17 +34419,13 @@
+@@ -81963,17 +34370,13 @@
fi
@@ -87533,7 +87518,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
-@@ -82064,41 +34440,18 @@
+@@ -81988,41 +34391,18 @@
return 0;
}
_ACEOF
@@ -87579,7 +87564,7 @@
fi
-@@ -82108,7 +34461,7 @@
+@@ -82032,7 +34412,7 @@
# Check whether --with-included-popt was given.
@@ -87588,7 +87573,7 @@
withval=$with_included_popt;
case "$withval" in
yes)
-@@ -82121,18 +34474,14 @@
+@@ -82045,18 +34425,14 @@
fi
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -87610,7 +87595,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -82150,43 +34499,18 @@
+@@ -82074,43 +34450,18 @@
return 0;
}
_ACEOF
@@ -87660,7 +87645,7 @@
INCLUDED_POPT=no
else
INCLUDED_POPT=yes
-@@ -82194,16 +34518,16 @@
+@@ -82118,16 +34469,16 @@
fi
@@ -87680,7 +87665,7 @@
$as_echo "no" >&6; }
BUILD_POPT=""
POPTLIBS="-lpopt"
-@@ -82216,7 +34540,7 @@
+@@ -82140,7 +34491,7 @@
# Check if user wants DNS service discovery support
# Check whether --enable-dnssd was given.
@@ -87689,7 +87674,7 @@
enableval=$enable_dnssd;
fi
-@@ -82225,151 +34549,12 @@
+@@ -82149,151 +34500,12 @@
if test x"$enable_dnssd" = x"yes"; then
have_dnssd_support=yes
@@ -87846,7 +87831,7 @@
_ACEOF
fi
-@@ -82382,102 +34567,12 @@
+@@ -82306,102 +34518,12 @@
# On Darwin the DNSSD API is in libc, but on other platforms it's
# probably in -ldns_sd
@@ -87954,7 +87939,7 @@
_ACEOF
fi
-@@ -82485,23 +34580,17 @@
+@@ -82409,23 +34531,17 @@
@@ -87981,11 +87966,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -82513,60 +34602,34 @@
- char DNSServiceRegister ();
+@@ -82438,59 +34554,33 @@
int
main ()
--{
+ {
-return DNSServiceRegister ();
- ;
- return 0;
@@ -88012,7 +87996,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+{
+return DNSServiceRegister ();
+ ;
+ return 0;
@@ -88055,7 +88038,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNS_SD 1
_ACEOF
-@@ -82581,7 +34644,6 @@
+@@ -82505,7 +34595,6 @@
fi
@@ -88063,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
-@@ -82589,15 +34651,11 @@
+@@ -82513,15 +34602,11 @@
if test x"$have_dnssd_support" = x"yes"; then
@@ -88081,7 +88064,7 @@
fi
fi
-@@ -82607,7 +34665,7 @@
+@@ -82531,7 +34616,7 @@
# Check if user wants avahi support
# Check whether --enable-avahi was given.
@@ -88090,7 +88073,7 @@
enableval=$enable_avahi;
fi
-@@ -82615,151 +34673,12 @@
+@@ -82539,151 +34624,12 @@
if test x"$enable_avahi" != x"no"; then
have_avahi_support=yes
@@ -88247,7 +88230,7 @@
_ACEOF
fi
-@@ -82770,151 +34689,12 @@
+@@ -82694,151 +34640,12 @@
have_avahi_support=no
fi
@@ -88404,7 +88387,7 @@
_ACEOF
fi
-@@ -82926,18 +34706,14 @@
+@@ -82850,18 +34657,14 @@
fi
save_LIBS="$LIBS"
@@ -88426,7 +88409,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -82955,58 +34731,29 @@
+@@ -82879,58 +34682,29 @@
return 0;
}
_ACEOF
@@ -88494,7 +88477,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -83024,43 +34771,18 @@
+@@ -82948,43 +34722,18 @@
return 0;
}
_ACEOF
@@ -88544,7 +88527,7 @@
have_avahi_strerror=yes
fi
-@@ -83075,17 +34797,13 @@
+@@ -82999,17 +34748,13 @@
AVAHI_LIBS="-lavahi-client -lavahi-common"
@@ -88564,7 +88547,7 @@
fi
fi
fi
-@@ -83100,18 +34818,14 @@
+@@ -83024,18 +34769,14 @@
# If it's error, then the user didn't
# define it.
if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88586,7 +88569,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -83129,43 +34843,18 @@
+@@ -83053,43 +34794,18 @@
return 0;
}
_ACEOF
@@ -88636,7 +88619,7 @@
PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
PTHREAD_LDFLAGS="-lpthread"
-@@ -83174,18 +34863,14 @@
+@@ -83098,18 +34814,14 @@
fi
if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88658,7 +88641,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -83203,43 +34888,18 @@
+@@ -83127,43 +34839,18 @@
return 0;
}
_ACEOF
@@ -88708,7 +88691,7 @@
PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LDFLAGS="-lpthreads"
-@@ -83248,18 +34908,14 @@
+@@ -83172,18 +34859,14 @@
fi
if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88730,7 +88713,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -83277,43 +34933,18 @@
+@@ -83201,43 +34884,18 @@
return 0;
}
_ACEOF
@@ -88780,7 +88763,7 @@
PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread"
PTHREAD_LDFLAGS="-pthread"
-@@ -83322,92 +34953,8 @@
+@@ -83246,92 +34904,8 @@
fi
if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88875,7 +88858,7 @@
PTHREAD_CFLAGS="-D_REENTRANT"
PTHREAD_LDFLAGS="-lpthread"
-@@ -83418,18 +34965,14 @@
+@@ -83342,18 +34916,14 @@
# especially for HP-UX, where the AC_CHECK_FUNC macro fails to test for
# pthread_attr_init. On pthread_mutex_lock it works there...
if test "x$PTHREAD_LDFLAGS" = xerror; then
@@ -88897,7 +88880,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -83447,43 +34990,18 @@
+@@ -83371,43 +34941,18 @@
return 0;
}
_ACEOF
@@ -88947,7 +88930,7 @@
PTHREAD_CFLAGS="-D_REENTRANT"
PTHREAD_LDFLAGS="-lpthread"
-@@ -83502,151 +35020,12 @@
+@@ -83426,151 +34971,12 @@
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
ac_save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
@@ -89104,7 +89087,18 @@
_ACEOF
fi
-@@ -83661,24 +35040,20 @@
+@@ -83580,9 +34986,7 @@
+ CFLAGS=$ac_save_CFLAGS
+ LDFLAGS=$ac_save_LDFLAGS
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PTHREAD 1
+-_ACEOF
++$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
+ fi
+
+@@ -83590,24 +34994,20 @@
# Check if user wants pthreadpool support
# Check whether --enable-pthreadpool was given.
@@ -89132,7 +89126,7 @@
PTHREADPOOL_OBJ="lib/pthreadpool.o"
-@@ -83689,7 +35064,7 @@
+@@ -83618,7 +35018,7 @@
# Check whether --with-included-iniparser was given.
@@ -89141,7 +89135,7 @@
withval=$with_included_iniparser;
case "$withval" in
yes)
-@@ -83702,18 +35077,14 @@
+@@ -83631,18 +35031,14 @@
fi
if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -89163,7 +89157,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -83731,43 +35102,18 @@
+@@ -83660,43 +35056,18 @@
return 0;
}
_ACEOF
@@ -89213,7 +89207,7 @@
INCLUDED_INIPARSER=no
else
INCLUDED_INIPARSER=yes
-@@ -83775,260 +35121,40 @@
+@@ -83704,260 +35075,40 @@
fi
@@ -89499,7 +89493,7 @@
_ACEOF
fi
-@@ -84036,20 +35162,16 @@
+@@ -83965,20 +35116,16 @@
done
@@ -89524,7 +89518,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -84061,46 +35183,19 @@
+@@ -83990,46 +35137,19 @@
return statfs (".", &fsd);
}
_ACEOF
@@ -89576,7 +89570,7 @@
$as_echo "$vfsfileid_cv_statfs" >&6; }
if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -84135,7 +35230,7 @@
+@@ -84064,7 +35184,7 @@
# Check whether --with-static-modules was given.
@@ -89585,7 +89579,7 @@
withval=$with_static_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -84147,7 +35242,7 @@
+@@ -84076,7 +35196,7 @@
# Check whether --with-shared-modules was given.
@@ -89594,7 +89588,7 @@
withval=$with_shared_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -84164,7 +35259,7 @@
+@@ -84093,7 +35213,7 @@
fi
@@ -89603,7 +89597,7 @@
$as_echo_n "checking how to build pdb_ldap... " >&6; }
if test "$MODULE_pdb_ldap"; then
DEST=$MODULE_pdb_ldap
-@@ -84176,12 +35271,10 @@
+@@ -84105,12 +35225,10 @@
if test x"$DEST" = xSHARED; then
@@ -89618,7 +89612,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -84192,16 +35285,16 @@
+@@ -84121,16 +35239,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -89638,7 +89632,7 @@
$as_echo_n "checking how to build pdb_ads... " >&6; }
if test "$MODULE_pdb_ads"; then
DEST=$MODULE_pdb_ads
-@@ -84213,12 +35306,10 @@
+@@ -84142,12 +35260,10 @@
if test x"$DEST" = xSHARED; then
@@ -89653,7 +89647,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ads"
-@@ -84229,16 +35320,16 @@
+@@ -84158,16 +35274,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
@@ -89673,7 +89667,7 @@
$as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
if test "$MODULE_pdb_smbpasswd"; then
DEST=$MODULE_pdb_smbpasswd
-@@ -84250,12 +35341,10 @@
+@@ -84179,12 +35295,10 @@
if test x"$DEST" = xSHARED; then
@@ -89688,7 +89682,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -84266,16 +35355,16 @@
+@@ -84195,16 +35309,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
@@ -89708,7 +89702,7 @@
$as_echo_n "checking how to build pdb_tdbsam... " >&6; }
if test "$MODULE_pdb_tdbsam"; then
DEST=$MODULE_pdb_tdbsam
-@@ -84287,12 +35376,10 @@
+@@ -84216,12 +35330,10 @@
if test x"$DEST" = xSHARED; then
@@ -89723,7 +89717,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -84303,16 +35390,16 @@
+@@ -84232,16 +35344,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
@@ -89743,7 +89737,7 @@
$as_echo_n "checking how to build pdb_wbc_sam... " >&6; }
if test "$MODULE_pdb_wbc_sam"; then
DEST=$MODULE_pdb_wbc_sam
-@@ -84324,12 +35411,10 @@
+@@ -84253,12 +35365,10 @@
if test x"$DEST" = xSHARED; then
@@ -89758,7 +89752,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -84340,11 +35425,11 @@
+@@ -84269,11 +35379,11 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
@@ -89772,7 +89766,7 @@
$as_echo "not" >&6; }
fi
-@@ -84366,7 +35451,7 @@
+@@ -84295,7 +35405,7 @@
@@ -89781,7 +89775,7 @@
$as_echo_n "checking how to build rpc_lsarpc... " >&6; }
if test "$MODULE_rpc_lsarpc"; then
DEST=$MODULE_rpc_lsarpc
-@@ -84378,12 +35463,10 @@
+@@ -84307,12 +35417,10 @@
if test x"$DEST" = xSHARED; then
@@ -89796,7 +89790,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -84394,16 +35477,16 @@
+@@ -84323,16 +35431,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
@@ -89816,7 +89810,7 @@
$as_echo_n "checking how to build rpc_winreg... " >&6; }
if test "$MODULE_rpc_winreg"; then
DEST=$MODULE_rpc_winreg
-@@ -84415,12 +35498,10 @@
+@@ -84344,12 +35452,10 @@
if test x"$DEST" = xSHARED; then
@@ -89831,7 +89825,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -84431,16 +35512,16 @@
+@@ -84360,16 +35466,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
@@ -89851,7 +89845,7 @@
$as_echo_n "checking how to build rpc_initshutdown... " >&6; }
if test "$MODULE_rpc_initshutdown"; then
DEST=$MODULE_rpc_initshutdown
-@@ -84452,12 +35533,10 @@
+@@ -84381,12 +35487,10 @@
if test x"$DEST" = xSHARED; then
@@ -89866,7 +89860,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -84468,16 +35547,16 @@
+@@ -84397,16 +35501,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
@@ -89886,7 +89880,7 @@
$as_echo_n "checking how to build rpc_dssetup... " >&6; }
if test "$MODULE_rpc_dssetup"; then
DEST=$MODULE_rpc_dssetup
-@@ -84489,12 +35568,10 @@
+@@ -84418,12 +35522,10 @@
if test x"$DEST" = xSHARED; then
@@ -89901,7 +89895,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -84505,16 +35582,16 @@
+@@ -84434,16 +35536,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
@@ -89921,7 +89915,7 @@
$as_echo_n "checking how to build rpc_wkssvc... " >&6; }
if test "$MODULE_rpc_wkssvc"; then
DEST=$MODULE_rpc_wkssvc
-@@ -84526,12 +35603,10 @@
+@@ -84455,12 +35557,10 @@
if test x"$DEST" = xSHARED; then
@@ -89936,7 +89930,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -84542,16 +35617,16 @@
+@@ -84471,16 +35571,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
@@ -89956,7 +89950,7 @@
$as_echo_n "checking how to build rpc_svcctl... " >&6; }
if test "$MODULE_rpc_svcctl"; then
DEST=$MODULE_rpc_svcctl
-@@ -84563,12 +35638,10 @@
+@@ -84492,12 +35592,10 @@
if test x"$DEST" = xSHARED; then
@@ -89971,7 +89965,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -84579,16 +35652,16 @@
+@@ -84508,16 +35606,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
@@ -89991,7 +89985,7 @@
$as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
if test "$MODULE_rpc_ntsvcs"; then
DEST=$MODULE_rpc_ntsvcs
-@@ -84600,12 +35673,10 @@
+@@ -84529,12 +35627,10 @@
if test x"$DEST" = xSHARED; then
@@ -90006,7 +90000,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -84616,16 +35687,16 @@
+@@ -84545,16 +35641,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
@@ -90026,7 +90020,7 @@
$as_echo_n "checking how to build rpc_netlogon... " >&6; }
if test "$MODULE_rpc_netlogon"; then
DEST=$MODULE_rpc_netlogon
-@@ -84637,12 +35708,10 @@
+@@ -84566,12 +35662,10 @@
if test x"$DEST" = xSHARED; then
@@ -90041,7 +90035,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -84653,16 +35722,16 @@
+@@ -84582,16 +35676,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
@@ -90061,7 +90055,7 @@
$as_echo_n "checking how to build rpc_netdfs... " >&6; }
if test "$MODULE_rpc_netdfs"; then
DEST=$MODULE_rpc_netdfs
-@@ -84674,12 +35743,10 @@
+@@ -84603,12 +35697,10 @@
if test x"$DEST" = xSHARED; then
@@ -90076,7 +90070,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -84690,16 +35757,16 @@
+@@ -84619,16 +35711,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
@@ -90096,7 +90090,7 @@
$as_echo_n "checking how to build rpc_srvsvc... " >&6; }
if test "$MODULE_rpc_srvsvc"; then
DEST=$MODULE_rpc_srvsvc
-@@ -84711,12 +35778,10 @@
+@@ -84640,12 +35732,10 @@
if test x"$DEST" = xSHARED; then
@@ -90111,7 +90105,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -84727,16 +35792,16 @@
+@@ -84656,16 +35746,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
@@ -90131,7 +90125,7 @@
$as_echo_n "checking how to build rpc_spoolss... " >&6; }
if test "$MODULE_rpc_spoolss"; then
DEST=$MODULE_rpc_spoolss
-@@ -84748,12 +35813,10 @@
+@@ -84677,12 +35767,10 @@
if test x"$DEST" = xSHARED; then
@@ -90146,7 +90140,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -84764,16 +35827,16 @@
+@@ -84693,16 +35781,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
@@ -90166,7 +90160,7 @@
$as_echo_n "checking how to build rpc_eventlog... " >&6; }
if test "$MODULE_rpc_eventlog"; then
DEST=$MODULE_rpc_eventlog
-@@ -84785,12 +35848,10 @@
+@@ -84714,12 +35802,10 @@
if test x"$DEST" = xSHARED; then
@@ -90181,7 +90175,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -84801,16 +35862,16 @@
+@@ -84730,16 +35816,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
@@ -90201,7 +90195,7 @@
$as_echo_n "checking how to build rpc_samr... " >&6; }
if test "$MODULE_rpc_samr"; then
DEST=$MODULE_rpc_samr
-@@ -84822,12 +35883,10 @@
+@@ -84751,12 +35837,10 @@
if test x"$DEST" = xSHARED; then
@@ -90216,7 +90210,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_samr"
-@@ -84838,16 +35897,16 @@
+@@ -84767,16 +35851,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
@@ -90236,7 +90230,7 @@
$as_echo_n "checking how to build rpc_rpcecho... " >&6; }
if test "$MODULE_rpc_rpcecho"; then
DEST=$MODULE_rpc_rpcecho
-@@ -84859,12 +35918,10 @@
+@@ -84788,12 +35872,10 @@
if test x"$DEST" = xSHARED; then
@@ -90251,7 +90245,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -84875,11 +35932,11 @@
+@@ -84804,11 +35886,11 @@
RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
@@ -90265,7 +90259,7 @@
$as_echo "not" >&6; }
fi
-@@ -84900,7 +35957,7 @@
+@@ -84829,7 +35911,7 @@
@@ -90274,7 +90268,7 @@
$as_echo_n "checking how to build idmap_ldap... " >&6; }
if test "$MODULE_idmap_ldap"; then
DEST=$MODULE_idmap_ldap
-@@ -84912,12 +35969,10 @@
+@@ -84841,12 +35923,10 @@
if test x"$DEST" = xSHARED; then
@@ -90289,7 +90283,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -84928,16 +35983,16 @@
+@@ -84857,16 +35937,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
@@ -90309,7 +90303,7 @@
$as_echo_n "checking how to build idmap_tdb... " >&6; }
if test "$MODULE_idmap_tdb"; then
DEST=$MODULE_idmap_tdb
-@@ -84949,12 +36004,10 @@
+@@ -84878,12 +35958,10 @@
if test x"$DEST" = xSHARED; then
@@ -90324,7 +90318,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -84965,16 +36018,16 @@
+@@ -84894,16 +35972,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
@@ -90344,7 +90338,7 @@
$as_echo_n "checking how to build idmap_tdb2... " >&6; }
if test "$MODULE_idmap_tdb2"; then
DEST=$MODULE_idmap_tdb2
-@@ -84986,12 +36039,10 @@
+@@ -84915,12 +35993,10 @@
if test x"$DEST" = xSHARED; then
@@ -90359,7 +90353,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -85002,16 +36053,16 @@
+@@ -84931,16 +36007,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
@@ -90379,7 +90373,7 @@
$as_echo_n "checking how to build idmap_passdb... " >&6; }
if test "$MODULE_idmap_passdb"; then
DEST=$MODULE_idmap_passdb
-@@ -85023,12 +36074,10 @@
+@@ -84952,12 +36028,10 @@
if test x"$DEST" = xSHARED; then
@@ -90394,7 +90388,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -85039,16 +36088,16 @@
+@@ -84968,16 +36042,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
@@ -90414,7 +90408,7 @@
$as_echo_n "checking how to build idmap_nss... " >&6; }
if test "$MODULE_idmap_nss"; then
DEST=$MODULE_idmap_nss
-@@ -85060,12 +36109,10 @@
+@@ -84989,12 +36063,10 @@
if test x"$DEST" = xSHARED; then
@@ -90429,7 +90423,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_nss"
-@@ -85076,16 +36123,16 @@
+@@ -85005,16 +36077,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
@@ -90449,7 +90443,7 @@
$as_echo_n "checking how to build idmap_rid... " >&6; }
if test "$MODULE_idmap_rid"; then
DEST=$MODULE_idmap_rid
-@@ -85097,12 +36144,10 @@
+@@ -85026,12 +36098,10 @@
if test x"$DEST" = xSHARED; then
@@ -90464,7 +90458,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_rid"
-@@ -85113,16 +36158,16 @@
+@@ -85042,16 +36112,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
@@ -90484,7 +90478,7 @@
$as_echo_n "checking how to build idmap_ad... " >&6; }
if test "$MODULE_idmap_ad"; then
DEST=$MODULE_idmap_ad
-@@ -85134,12 +36179,10 @@
+@@ -85063,12 +36133,10 @@
if test x"$DEST" = xSHARED; then
@@ -90499,7 +90493,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ad"
-@@ -85150,16 +36193,16 @@
+@@ -85079,16 +36147,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
@@ -90519,7 +90513,7 @@
$as_echo_n "checking how to build idmap_hash... " >&6; }
if test "$MODULE_idmap_hash"; then
DEST=$MODULE_idmap_hash
-@@ -85171,12 +36214,10 @@
+@@ -85100,12 +36168,10 @@
if test x"$DEST" = xSHARED; then
@@ -90534,7 +90528,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_hash"
-@@ -85187,16 +36228,16 @@
+@@ -85116,16 +36182,16 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
@@ -90554,7 +90548,7 @@
$as_echo_n "checking how to build idmap_adex... " >&6; }
if test "$MODULE_idmap_adex"; then
DEST=$MODULE_idmap_adex
-@@ -85208,12 +36249,10 @@
+@@ -85137,12 +36203,10 @@
if test x"$DEST" = xSHARED; then
@@ -90569,7 +90563,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_adex"
-@@ -85224,11 +36263,11 @@
+@@ -85153,11 +36217,11 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
@@ -90583,7 +90577,7 @@
$as_echo "not" >&6; }
fi
-@@ -85249,7 +36288,7 @@
+@@ -85178,7 +36242,7 @@
@@ -90592,7 +90586,7 @@
$as_echo_n "checking how to build nss_info_template... " >&6; }
if test "$MODULE_nss_info_template"; then
DEST=$MODULE_nss_info_template
-@@ -85261,12 +36300,10 @@
+@@ -85190,12 +36254,10 @@
if test x"$DEST" = xSHARED; then
@@ -90607,7 +90601,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules nss_info_template"
-@@ -85277,11 +36314,11 @@
+@@ -85206,11 +36268,11 @@
NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
@@ -90621,7 +90615,7 @@
$as_echo "not" >&6; }
fi
-@@ -85302,7 +36339,7 @@
+@@ -85231,7 +36293,7 @@
@@ -90630,7 +90624,7 @@
$as_echo_n "checking how to build charset_weird... " >&6; }
if test "$MODULE_charset_weird"; then
DEST=$MODULE_charset_weird
-@@ -85314,12 +36351,10 @@
+@@ -85243,12 +36305,10 @@
if test x"$DEST" = xSHARED; then
@@ -90645,7 +90639,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_weird"
-@@ -85330,16 +36365,16 @@
+@@ -85259,16 +36319,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
@@ -90665,7 +90659,7 @@
$as_echo_n "checking how to build charset_CP850... " >&6; }
if test "$MODULE_charset_CP850"; then
DEST=$MODULE_charset_CP850
-@@ -85351,12 +36386,10 @@
+@@ -85280,12 +36340,10 @@
if test x"$DEST" = xSHARED; then
@@ -90680,7 +90674,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP850"
-@@ -85367,16 +36400,16 @@
+@@ -85296,16 +36354,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
@@ -90700,7 +90694,7 @@
$as_echo_n "checking how to build charset_CP437... " >&6; }
if test "$MODULE_charset_CP437"; then
DEST=$MODULE_charset_CP437
-@@ -85388,12 +36421,10 @@
+@@ -85317,12 +36375,10 @@
if test x"$DEST" = xSHARED; then
@@ -90715,7 +90709,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP437"
-@@ -85404,16 +36435,16 @@
+@@ -85333,16 +36389,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
@@ -90735,7 +90729,7 @@
$as_echo_n "checking how to build charset_macosxfs... " >&6; }
if test "$MODULE_charset_macosxfs"; then
DEST=$MODULE_charset_macosxfs
-@@ -85425,12 +36456,10 @@
+@@ -85354,12 +36410,10 @@
if test x"$DEST" = xSHARED; then
@@ -90750,7 +90744,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -85441,11 +36470,11 @@
+@@ -85370,11 +36424,11 @@
CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
@@ -90764,7 +90758,7 @@
$as_echo "not" >&6; }
fi
-@@ -85466,7 +36495,7 @@
+@@ -85395,7 +36449,7 @@
@@ -90773,7 +90767,7 @@
$as_echo_n "checking how to build auth_sam... " >&6; }
if test "$MODULE_auth_sam"; then
DEST=$MODULE_auth_sam
-@@ -85478,12 +36507,10 @@
+@@ -85407,12 +36461,10 @@
if test x"$DEST" = xSHARED; then
@@ -90788,7 +90782,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_sam"
-@@ -85494,16 +36521,16 @@
+@@ -85423,16 +36475,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
@@ -90808,7 +90802,7 @@
$as_echo_n "checking how to build auth_unix... " >&6; }
if test "$MODULE_auth_unix"; then
DEST=$MODULE_auth_unix
-@@ -85515,12 +36542,10 @@
+@@ -85444,12 +36496,10 @@
if test x"$DEST" = xSHARED; then
@@ -90823,7 +90817,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_unix"
-@@ -85531,16 +36556,16 @@
+@@ -85460,16 +36510,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
@@ -90843,7 +90837,7 @@
$as_echo_n "checking how to build auth_winbind... " >&6; }
if test "$MODULE_auth_winbind"; then
DEST=$MODULE_auth_winbind
-@@ -85552,12 +36577,10 @@
+@@ -85481,12 +36531,10 @@
if test x"$DEST" = xSHARED; then
@@ -90858,7 +90852,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_winbind"
-@@ -85568,16 +36591,16 @@
+@@ -85497,16 +36545,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
@@ -90878,7 +90872,7 @@
$as_echo_n "checking how to build auth_wbc... " >&6; }
if test "$MODULE_auth_wbc"; then
DEST=$MODULE_auth_wbc
-@@ -85589,12 +36612,10 @@
+@@ -85518,12 +36566,10 @@
if test x"$DEST" = xSHARED; then
@@ -90893,7 +90887,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_wbc"
-@@ -85605,16 +36626,16 @@
+@@ -85534,16 +36580,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
@@ -90913,7 +90907,7 @@
$as_echo_n "checking how to build auth_server... " >&6; }
if test "$MODULE_auth_server"; then
DEST=$MODULE_auth_server
-@@ -85626,12 +36647,10 @@
+@@ -85555,12 +36601,10 @@
if test x"$DEST" = xSHARED; then
@@ -90928,7 +90922,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_server"
-@@ -85642,16 +36661,16 @@
+@@ -85571,16 +36615,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
@@ -90948,7 +90942,7 @@
$as_echo_n "checking how to build auth_domain... " >&6; }
if test "$MODULE_auth_domain"; then
DEST=$MODULE_auth_domain
-@@ -85663,12 +36682,10 @@
+@@ -85592,12 +36636,10 @@
if test x"$DEST" = xSHARED; then
@@ -90963,7 +90957,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_domain"
-@@ -85679,16 +36696,16 @@
+@@ -85608,16 +36650,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
@@ -90983,7 +90977,7 @@
$as_echo_n "checking how to build auth_builtin... " >&6; }
if test "$MODULE_auth_builtin"; then
DEST=$MODULE_auth_builtin
-@@ -85700,12 +36717,10 @@
+@@ -85629,12 +36671,10 @@
if test x"$DEST" = xSHARED; then
@@ -90998,7 +90992,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_builtin"
-@@ -85716,16 +36731,16 @@
+@@ -85645,16 +36685,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
@@ -91018,7 +91012,7 @@
$as_echo_n "checking how to build auth_script... " >&6; }
if test "$MODULE_auth_script"; then
DEST=$MODULE_auth_script
-@@ -85737,12 +36752,10 @@
+@@ -85666,12 +36706,10 @@
if test x"$DEST" = xSHARED; then
@@ -91033,7 +91027,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_script"
-@@ -85753,16 +36766,16 @@
+@@ -85682,16 +36720,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
@@ -91053,7 +91047,7 @@
$as_echo_n "checking how to build auth_netlogond... " >&6; }
if test "$MODULE_auth_netlogond"; then
DEST=$MODULE_auth_netlogond
-@@ -85774,12 +36787,10 @@
+@@ -85703,12 +36741,10 @@
if test x"$DEST" = xSHARED; then
@@ -91068,7 +91062,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -85790,11 +36801,11 @@
+@@ -85719,11 +36755,11 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
@@ -91082,7 +91076,7 @@
$as_echo "not" >&6; }
fi
-@@ -85815,7 +36826,7 @@
+@@ -85744,7 +36780,7 @@
@@ -91091,7 +91085,7 @@
$as_echo_n "checking how to build vfs_default... " >&6; }
if test "$MODULE_vfs_default"; then
DEST=$MODULE_vfs_default
-@@ -85827,12 +36838,10 @@
+@@ -85756,12 +36792,10 @@
if test x"$DEST" = xSHARED; then
@@ -91106,7 +91100,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default"
-@@ -85843,16 +36852,16 @@
+@@ -85772,16 +36806,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
@@ -91126,7 +91120,7 @@
$as_echo_n "checking how to build vfs_recycle... " >&6; }
if test "$MODULE_vfs_recycle"; then
DEST=$MODULE_vfs_recycle
-@@ -85864,12 +36873,10 @@
+@@ -85793,12 +36827,10 @@
if test x"$DEST" = xSHARED; then
@@ -91141,7 +91135,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -85880,16 +36887,16 @@
+@@ -85809,16 +36841,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
@@ -91161,7 +91155,7 @@
$as_echo_n "checking how to build vfs_audit... " >&6; }
if test "$MODULE_vfs_audit"; then
DEST=$MODULE_vfs_audit
-@@ -85901,12 +36908,10 @@
+@@ -85830,12 +36862,10 @@
if test x"$DEST" = xSHARED; then
@@ -91176,7 +91170,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_audit"
-@@ -85917,16 +36922,16 @@
+@@ -85846,16 +36876,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
@@ -91196,7 +91190,7 @@
$as_echo_n "checking how to build vfs_extd_audit... " >&6; }
if test "$MODULE_vfs_extd_audit"; then
DEST=$MODULE_vfs_extd_audit
-@@ -85938,12 +36943,10 @@
+@@ -85867,12 +36897,10 @@
if test x"$DEST" = xSHARED; then
@@ -91211,7 +91205,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -85954,16 +36957,16 @@
+@@ -85883,16 +36911,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
@@ -91231,7 +91225,7 @@
$as_echo_n "checking how to build vfs_full_audit... " >&6; }
if test "$MODULE_vfs_full_audit"; then
DEST=$MODULE_vfs_full_audit
-@@ -85975,12 +36978,10 @@
+@@ -85904,12 +36932,10 @@
if test x"$DEST" = xSHARED; then
@@ -91246,7 +91240,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -85991,16 +36992,16 @@
+@@ -85920,16 +36946,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
@@ -91266,7 +91260,7 @@
$as_echo_n "checking how to build vfs_netatalk... " >&6; }
if test "$MODULE_vfs_netatalk"; then
DEST=$MODULE_vfs_netatalk
-@@ -86012,12 +37013,10 @@
+@@ -85941,12 +36967,10 @@
if test x"$DEST" = xSHARED; then
@@ -91281,7 +91275,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -86028,16 +37027,16 @@
+@@ -85957,16 +36981,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
@@ -91301,7 +91295,7 @@
$as_echo_n "checking how to build vfs_fake_perms... " >&6; }
if test "$MODULE_vfs_fake_perms"; then
DEST=$MODULE_vfs_fake_perms
-@@ -86049,12 +37048,10 @@
+@@ -85978,12 +37002,10 @@
if test x"$DEST" = xSHARED; then
@@ -91316,7 +91310,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -86065,16 +37062,16 @@
+@@ -85994,16 +37016,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
@@ -91336,7 +91330,7 @@
$as_echo_n "checking how to build vfs_default_quota... " >&6; }
if test "$MODULE_vfs_default_quota"; then
DEST=$MODULE_vfs_default_quota
-@@ -86086,12 +37083,10 @@
+@@ -86015,12 +37037,10 @@
if test x"$DEST" = xSHARED; then
@@ -91351,7 +91345,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -86102,16 +37097,16 @@
+@@ -86031,16 +37051,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
@@ -91371,7 +91365,7 @@
$as_echo_n "checking how to build vfs_readonly... " >&6; }
if test "$MODULE_vfs_readonly"; then
DEST=$MODULE_vfs_readonly
-@@ -86123,12 +37118,10 @@
+@@ -86052,12 +37072,10 @@
if test x"$DEST" = xSHARED; then
@@ -91386,7 +91380,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -86139,16 +37132,16 @@
+@@ -86068,16 +37086,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
@@ -91406,7 +91400,7 @@
$as_echo_n "checking how to build vfs_cap... " >&6; }
if test "$MODULE_vfs_cap"; then
DEST=$MODULE_vfs_cap
-@@ -86160,12 +37153,10 @@
+@@ -86089,12 +37107,10 @@
if test x"$DEST" = xSHARED; then
@@ -91421,7 +91415,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cap"
-@@ -86176,16 +37167,16 @@
+@@ -86105,16 +37121,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
@@ -91441,7 +91435,7 @@
$as_echo_n "checking how to build vfs_expand_msdfs... " >&6; }
if test "$MODULE_vfs_expand_msdfs"; then
DEST=$MODULE_vfs_expand_msdfs
-@@ -86197,12 +37188,10 @@
+@@ -86126,12 +37142,10 @@
if test x"$DEST" = xSHARED; then
@@ -91456,7 +91450,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -86213,16 +37202,16 @@
+@@ -86142,16 +37156,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
@@ -91476,7 +91470,7 @@
$as_echo_n "checking how to build vfs_shadow_copy... " >&6; }
if test "$MODULE_vfs_shadow_copy"; then
DEST=$MODULE_vfs_shadow_copy
-@@ -86234,12 +37223,10 @@
+@@ -86163,12 +37177,10 @@
if test x"$DEST" = xSHARED; then
@@ -91491,7 +91485,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -86250,16 +37237,16 @@
+@@ -86179,16 +37191,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
@@ -91511,7 +91505,7 @@
$as_echo_n "checking how to build vfs_shadow_copy2... " >&6; }
if test "$MODULE_vfs_shadow_copy2"; then
DEST=$MODULE_vfs_shadow_copy2
-@@ -86271,12 +37258,10 @@
+@@ -86200,12 +37212,10 @@
if test x"$DEST" = xSHARED; then
@@ -91526,7 +91520,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -86287,16 +37272,16 @@
+@@ -86216,16 +37226,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
@@ -91546,7 +91540,7 @@
$as_echo_n "checking how to build vfs_afsacl... " >&6; }
if test "$MODULE_vfs_afsacl"; then
DEST=$MODULE_vfs_afsacl
-@@ -86308,12 +37293,10 @@
+@@ -86237,12 +37247,10 @@
if test x"$DEST" = xSHARED; then
@@ -91561,7 +91555,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -86324,16 +37307,16 @@
+@@ -86253,16 +37261,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
@@ -91581,7 +91575,7 @@
$as_echo_n "checking how to build vfs_xattr_tdb... " >&6; }
if test "$MODULE_vfs_xattr_tdb"; then
DEST=$MODULE_vfs_xattr_tdb
-@@ -86345,12 +37328,10 @@
+@@ -86274,12 +37282,10 @@
if test x"$DEST" = xSHARED; then
@@ -91596,7 +91590,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -86361,16 +37342,16 @@
+@@ -86290,16 +37296,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
@@ -91616,7 +91610,7 @@
$as_echo_n "checking how to build vfs_posixacl... " >&6; }
if test "$MODULE_vfs_posixacl"; then
DEST=$MODULE_vfs_posixacl
-@@ -86382,12 +37363,10 @@
+@@ -86311,12 +37317,10 @@
if test x"$DEST" = xSHARED; then
@@ -91631,7 +91625,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -86398,16 +37377,16 @@
+@@ -86327,16 +37331,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
@@ -91651,7 +91645,7 @@
$as_echo_n "checking how to build vfs_aixacl... " >&6; }
if test "$MODULE_vfs_aixacl"; then
DEST=$MODULE_vfs_aixacl
-@@ -86419,12 +37398,10 @@
+@@ -86348,12 +37352,10 @@
if test x"$DEST" = xSHARED; then
@@ -91666,7 +91660,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -86435,16 +37412,16 @@
+@@ -86364,16 +37366,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
@@ -91686,7 +91680,7 @@
$as_echo_n "checking how to build vfs_aixacl2... " >&6; }
if test "$MODULE_vfs_aixacl2"; then
DEST=$MODULE_vfs_aixacl2
-@@ -86456,12 +37433,10 @@
+@@ -86385,12 +37387,10 @@
if test x"$DEST" = xSHARED; then
@@ -91701,7 +91695,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -86472,16 +37447,16 @@
+@@ -86401,16 +37401,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
@@ -91721,7 +91715,7 @@
$as_echo_n "checking how to build vfs_solarisacl... " >&6; }
if test "$MODULE_vfs_solarisacl"; then
DEST=$MODULE_vfs_solarisacl
-@@ -86493,12 +37468,10 @@
+@@ -86422,12 +37422,10 @@
if test x"$DEST" = xSHARED; then
@@ -91736,7 +91730,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -86509,16 +37482,16 @@
+@@ -86438,16 +37436,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
@@ -91756,7 +91750,7 @@
$as_echo_n "checking how to build vfs_irixacl... " >&6; }
if test "$MODULE_vfs_irixacl"; then
DEST=$MODULE_vfs_irixacl
-@@ -86530,12 +37503,10 @@
+@@ -86459,12 +37457,10 @@
if test x"$DEST" = xSHARED; then
@@ -91771,7 +91765,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -86546,16 +37517,16 @@
+@@ -86475,16 +37471,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
@@ -91791,7 +91785,7 @@
$as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
if test "$MODULE_vfs_hpuxacl"; then
DEST=$MODULE_vfs_hpuxacl
-@@ -86567,12 +37538,10 @@
+@@ -86496,12 +37492,10 @@
if test x"$DEST" = xSHARED; then
@@ -91806,7 +91800,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -86583,16 +37552,16 @@
+@@ -86512,16 +37506,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
@@ -91826,7 +91820,7 @@
$as_echo_n "checking how to build vfs_tru64acl... " >&6; }
if test "$MODULE_vfs_tru64acl"; then
DEST=$MODULE_vfs_tru64acl
-@@ -86604,12 +37573,10 @@
+@@ -86533,12 +37527,10 @@
if test x"$DEST" = xSHARED; then
@@ -91841,7 +91835,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -86620,16 +37587,16 @@
+@@ -86549,16 +37541,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
@@ -91861,7 +91855,7 @@
$as_echo_n "checking how to build vfs_catia... " >&6; }
if test "$MODULE_vfs_catia"; then
DEST=$MODULE_vfs_catia
-@@ -86641,12 +37608,10 @@
+@@ -86570,12 +37562,10 @@
if test x"$DEST" = xSHARED; then
@@ -91876,7 +91870,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_catia"
-@@ -86657,16 +37622,16 @@
+@@ -86586,16 +37576,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
@@ -91896,7 +91890,7 @@
$as_echo_n "checking how to build vfs_streams_xattr... " >&6; }
if test "$MODULE_vfs_streams_xattr"; then
DEST=$MODULE_vfs_streams_xattr
-@@ -86678,12 +37643,10 @@
+@@ -86607,12 +37597,10 @@
if test x"$DEST" = xSHARED; then
@@ -91911,7 +91905,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -86694,16 +37657,16 @@
+@@ -86623,16 +37611,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
@@ -91931,7 +91925,7 @@
$as_echo_n "checking how to build vfs_streams_depot... " >&6; }
if test "$MODULE_vfs_streams_depot"; then
DEST=$MODULE_vfs_streams_depot
-@@ -86715,12 +37678,10 @@
+@@ -86644,12 +37632,10 @@
if test x"$DEST" = xSHARED; then
@@ -91946,7 +91940,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -86731,16 +37692,16 @@
+@@ -86660,16 +37646,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
@@ -91966,7 +91960,7 @@
$as_echo_n "checking how to build vfs_cacheprime... " >&6; }
if test "$MODULE_vfs_cacheprime"; then
DEST=$MODULE_vfs_cacheprime
-@@ -86752,12 +37713,10 @@
+@@ -86681,12 +37667,10 @@
if test x"$DEST" = xSHARED; then
@@ -91981,7 +91975,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -86768,16 +37727,16 @@
+@@ -86697,16 +37681,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
@@ -92001,7 +91995,7 @@
$as_echo_n "checking how to build vfs_prealloc... " >&6; }
if test "$MODULE_vfs_prealloc"; then
DEST=$MODULE_vfs_prealloc
-@@ -86789,12 +37748,10 @@
+@@ -86718,12 +37702,10 @@
if test x"$DEST" = xSHARED; then
@@ -92016,7 +92010,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -86805,16 +37762,16 @@
+@@ -86734,16 +37716,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
@@ -92036,7 +92030,7 @@
$as_echo_n "checking how to build vfs_commit... " >&6; }
if test "$MODULE_vfs_commit"; then
DEST=$MODULE_vfs_commit
-@@ -86826,12 +37783,10 @@
+@@ -86755,12 +37737,10 @@
if test x"$DEST" = xSHARED; then
@@ -92051,7 +92045,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_commit"
-@@ -86842,16 +37797,16 @@
+@@ -86771,16 +37751,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
@@ -92071,7 +92065,7 @@
$as_echo_n "checking how to build vfs_gpfs... " >&6; }
if test "$MODULE_vfs_gpfs"; then
DEST=$MODULE_vfs_gpfs
-@@ -86863,12 +37818,10 @@
+@@ -86792,12 +37772,10 @@
if test x"$DEST" = xSHARED; then
@@ -92086,7 +92080,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -86879,16 +37832,16 @@
+@@ -86808,16 +37786,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
@@ -92106,7 +92100,7 @@
$as_echo_n "checking how to build vfs_readahead... " >&6; }
if test "$MODULE_vfs_readahead"; then
DEST=$MODULE_vfs_readahead
-@@ -86900,12 +37853,10 @@
+@@ -86829,12 +37807,10 @@
if test x"$DEST" = xSHARED; then
@@ -92121,7 +92115,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -86916,16 +37867,16 @@
+@@ -86845,16 +37821,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
@@ -92141,7 +92135,7 @@
$as_echo_n "checking how to build vfs_tsmsm... " >&6; }
if test "$MODULE_vfs_tsmsm"; then
DEST=$MODULE_vfs_tsmsm
-@@ -86937,12 +37888,10 @@
+@@ -86866,12 +37842,10 @@
if test x"$DEST" = xSHARED; then
@@ -92156,7 +92150,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -86953,16 +37902,16 @@
+@@ -86882,16 +37856,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
@@ -92176,7 +92170,7 @@
$as_echo_n "checking how to build vfs_fileid... " >&6; }
if test "$MODULE_vfs_fileid"; then
DEST=$MODULE_vfs_fileid
-@@ -86974,12 +37923,10 @@
+@@ -86903,12 +37877,10 @@
if test x"$DEST" = xSHARED; then
@@ -92191,7 +92185,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -86990,16 +37937,16 @@
+@@ -86919,16 +37891,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
@@ -92211,7 +92205,7 @@
$as_echo_n "checking how to build vfs_aio_fork... " >&6; }
if test "$MODULE_vfs_aio_fork"; then
DEST=$MODULE_vfs_aio_fork
-@@ -87011,12 +37958,10 @@
+@@ -86940,12 +37912,10 @@
if test x"$DEST" = xSHARED; then
@@ -92226,7 +92220,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -87027,16 +37972,16 @@
+@@ -86956,16 +37926,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
@@ -92246,7 +92240,7 @@
$as_echo_n "checking how to build vfs_preopen... " >&6; }
if test "$MODULE_vfs_preopen"; then
DEST=$MODULE_vfs_preopen
-@@ -87048,12 +37993,10 @@
+@@ -86977,12 +37947,10 @@
if test x"$DEST" = xSHARED; then
@@ -92261,7 +92255,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -87064,16 +38007,16 @@
+@@ -86993,16 +37961,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
@@ -92281,7 +92275,7 @@
$as_echo_n "checking how to build vfs_syncops... " >&6; }
if test "$MODULE_vfs_syncops"; then
DEST=$MODULE_vfs_syncops
-@@ -87085,12 +38028,10 @@
+@@ -87014,12 +37982,10 @@
if test x"$DEST" = xSHARED; then
@@ -92296,7 +92290,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -87101,16 +38042,16 @@
+@@ -87030,16 +37996,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
@@ -92316,7 +92310,7 @@
$as_echo_n "checking how to build vfs_zfsacl... " >&6; }
if test "$MODULE_vfs_zfsacl"; then
DEST=$MODULE_vfs_zfsacl
-@@ -87122,12 +38063,10 @@
+@@ -87051,12 +38017,10 @@
if test x"$DEST" = xSHARED; then
@@ -92331,7 +92325,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -87138,16 +38077,16 @@
+@@ -87067,16 +38031,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
@@ -92351,7 +92345,7 @@
$as_echo_n "checking how to build vfs_notify_fam... " >&6; }
if test "$MODULE_vfs_notify_fam"; then
DEST=$MODULE_vfs_notify_fam
-@@ -87159,12 +38098,10 @@
+@@ -87088,12 +38052,10 @@
if test x"$DEST" = xSHARED; then
@@ -92366,7 +92360,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -87175,16 +38112,16 @@
+@@ -87104,16 +38066,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
@@ -92386,7 +92380,7 @@
$as_echo_n "checking how to build vfs_acl_xattr... " >&6; }
if test "$MODULE_vfs_acl_xattr"; then
DEST=$MODULE_vfs_acl_xattr
-@@ -87196,12 +38133,10 @@
+@@ -87125,12 +38087,10 @@
if test x"$DEST" = xSHARED; then
@@ -92401,7 +92395,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -87212,16 +38147,16 @@
+@@ -87141,16 +38101,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
@@ -92421,7 +92415,7 @@
$as_echo_n "checking how to build vfs_acl_tdb... " >&6; }
if test "$MODULE_vfs_acl_tdb"; then
DEST=$MODULE_vfs_acl_tdb
-@@ -87233,12 +38168,10 @@
+@@ -87162,12 +38122,10 @@
if test x"$DEST" = xSHARED; then
@@ -92436,7 +92430,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -87249,16 +38182,16 @@
+@@ -87178,16 +38136,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
@@ -92456,7 +92450,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
-@@ -87270,12 +38203,10 @@
+@@ -87199,12 +38157,10 @@
if test x"$DEST" = xSHARED; then
@@ -92471,7 +92465,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -87286,16 +38217,16 @@
+@@ -87215,16 +38171,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
@@ -92491,7 +92485,7 @@
$as_echo_n "checking how to build vfs_onefs... " >&6; }
if test "$MODULE_vfs_onefs"; then
DEST=$MODULE_vfs_onefs
-@@ -87307,12 +38238,10 @@
+@@ -87236,12 +38192,10 @@
if test x"$DEST" = xSHARED; then
@@ -92506,7 +92500,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -87323,16 +38252,16 @@
+@@ -87252,16 +38206,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
@@ -92526,7 +92520,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
-@@ -87344,12 +38273,10 @@
+@@ -87273,12 +38227,10 @@
if test x"$DEST" = xSHARED; then
@@ -92541,7 +92535,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -87360,16 +38287,16 @@
+@@ -87289,16 +38241,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
@@ -92561,7 +92555,7 @@
$as_echo_n "checking how to build vfs_dirsort... " >&6; }
if test "$MODULE_vfs_dirsort"; then
DEST=$MODULE_vfs_dirsort
-@@ -87381,12 +38308,10 @@
+@@ -87310,12 +38262,10 @@
if test x"$DEST" = xSHARED; then
@@ -92576,7 +92570,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -87397,16 +38322,16 @@
+@@ -87326,16 +38276,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
@@ -92596,7 +92590,7 @@
$as_echo_n "checking how to build vfs_scannedonly... " >&6; }
if test "$MODULE_vfs_scannedonly"; then
DEST=$MODULE_vfs_scannedonly
-@@ -87418,12 +38343,10 @@
+@@ -87347,12 +38297,10 @@
if test x"$DEST" = xSHARED; then
@@ -92611,7 +92605,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_scannedonly"
-@@ -87434,11 +38357,11 @@
+@@ -87363,11 +38311,11 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SCANNEDONLY_OBJ)"
@@ -92625,7 +92619,7 @@
$as_echo "not" >&6; }
fi
-@@ -87460,7 +38383,7 @@
+@@ -87389,7 +38337,7 @@
@@ -92634,7 +92628,7 @@
$as_echo_n "checking how to build perfcount_onefs... " >&6; }
if test "$MODULE_perfcount_onefs"; then
DEST=$MODULE_perfcount_onefs
-@@ -87472,12 +38395,10 @@
+@@ -87401,12 +38349,10 @@
if test x"$DEST" = xSHARED; then
@@ -92649,7 +92643,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -87488,16 +38409,16 @@
+@@ -87417,16 +38363,16 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
@@ -92669,7 +92663,7 @@
$as_echo_n "checking how to build perfcount_test... " >&6; }
if test "$MODULE_perfcount_test"; then
DEST=$MODULE_perfcount_test
-@@ -87509,12 +38430,10 @@
+@@ -87438,12 +38384,10 @@
if test x"$DEST" = xSHARED; then
@@ -92684,7 +92678,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_test"
-@@ -87525,11 +38444,11 @@
+@@ -87454,11 +38398,11 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
@@ -92698,7 +92692,7 @@
$as_echo "not" >&6; }
fi
-@@ -87550,7 +38469,7 @@
+@@ -87479,7 +38423,7 @@
@@ -92707,7 +92701,7 @@
$as_echo_n "checking how to build gpext_registry... " >&6; }
if test "$MODULE_gpext_registry"; then
DEST=$MODULE_gpext_registry
-@@ -87562,12 +38481,10 @@
+@@ -87491,12 +38435,10 @@
if test x"$DEST" = xSHARED; then
@@ -92722,7 +92716,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_registry"
-@@ -87578,16 +38495,16 @@
+@@ -87507,16 +38449,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
@@ -92742,7 +92736,7 @@
$as_echo_n "checking how to build gpext_scripts... " >&6; }
if test "$MODULE_gpext_scripts"; then
DEST=$MODULE_gpext_scripts
-@@ -87599,12 +38516,10 @@
+@@ -87528,12 +38470,10 @@
if test x"$DEST" = xSHARED; then
@@ -92757,7 +92751,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -87615,16 +38530,16 @@
+@@ -87544,16 +38484,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
@@ -92777,7 +92771,7 @@
$as_echo_n "checking how to build gpext_security... " >&6; }
if test "$MODULE_gpext_security"; then
DEST=$MODULE_gpext_security
-@@ -87636,12 +38551,10 @@
+@@ -87565,12 +38505,10 @@
if test x"$DEST" = xSHARED; then
@@ -92792,7 +92786,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_security"
-@@ -87652,11 +38565,11 @@
+@@ -87581,11 +38519,11 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
@@ -92806,7 +92800,7 @@
$as_echo "not" >&6; }
fi
-@@ -87692,18 +38605,16 @@
+@@ -87621,18 +38559,16 @@
#################################################
# If run from the build farm, enable NASTY hacks
#################################################
@@ -92829,7 +92823,7 @@
$as_echo "no" >&6; }
fi
-@@ -87720,11 +38631,11 @@
+@@ -87649,11 +38585,11 @@
rt_signal_lease_works=yes
rt_signal_aio_works=yes
@@ -92844,7 +92838,7 @@
$as_echo "cross" >&6; }
# cross compiling, I hope you know what you are doing
-@@ -87732,11 +38643,7 @@
+@@ -87661,11 +38597,7 @@
else
@@ -92857,7 +92851,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -87795,41 +38702,16 @@
+@@ -87724,41 +38656,16 @@
}
_ACEOF
@@ -92903,7 +92897,7 @@
/* end confdefs.h. */
int
-@@ -87840,61 +38722,31 @@
+@@ -87769,61 +38676,31 @@
return 0;
}
_ACEOF
@@ -92972,7 +92966,7 @@
$as_echo "no" >&6; }
case "$ac_status" in
1|11|101|111) rt_signal_lease_ok=no ;;
-@@ -87908,13 +38760,9 @@
+@@ -87837,13 +38714,9 @@
# no RT_SIGNAL bug, we are golden
@@ -92988,7 +92982,7 @@
/* end confdefs.h. */
int
-@@ -87925,65 +38773,39 @@
+@@ -87854,65 +38727,39 @@
return 0;
}
_ACEOF
@@ -93063,7 +93057,7 @@
enableval=$enable_merged_build; enable_merged_build=$enableval
else
enable_merged_build=auto
-@@ -87992,9 +38814,7 @@
+@@ -87921,9 +38768,7 @@
if test x"$enable_merged_build" = x"yes" -a \
x"$merged_build_possible" = x"no" ; then
@@ -93074,7 +93068,7 @@
fi
-@@ -88017,9 +38837,9 @@
+@@ -87946,9 +38791,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
@@ -93086,7 +93080,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -88032,14 +38852,14 @@
+@@ -87961,14 +38806,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93104,7 +93098,7 @@
IFS=$as_save_IFS
;;
-@@ -88047,10 +38867,10 @@
+@@ -87976,10 +38821,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -93117,7 +93111,7 @@
$as_echo "no" >&6; }
fi
-@@ -88061,9 +38881,9 @@
+@@ -87990,9 +38835,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
@@ -93129,7 +93123,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -88076,14 +38896,14 @@
+@@ -88005,14 +38850,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93147,7 +93141,7 @@
IFS=$as_save_IFS
;;
-@@ -88091,10 +38911,10 @@
+@@ -88020,10 +38865,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -93160,7 +93154,7 @@
$as_echo "no" >&6; }
fi
-@@ -88102,7 +38922,7 @@
+@@ -88031,7 +38876,7 @@
fi
if test -z "$PYTHON"; then
working_python=no
@@ -93169,7 +93163,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -88113,9 +38933,9 @@
+@@ -88042,9 +38887,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
@@ -93181,7 +93175,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -88128,14 +38948,14 @@
+@@ -88057,14 +38902,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93199,7 +93193,7 @@
IFS=$as_save_IFS
;;
-@@ -88143,10 +38963,10 @@
+@@ -88072,10 +38917,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -93212,7 +93206,7 @@
$as_echo "no" >&6; }
fi
-@@ -88157,9 +38977,9 @@
+@@ -88086,9 +38931,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
@@ -93224,7 +93218,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -88172,14 +38992,14 @@
+@@ -88101,14 +38946,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93242,7 +93236,7 @@
IFS=$as_save_IFS
;;
-@@ -88187,10 +39007,10 @@
+@@ -88116,10 +38961,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -93255,7 +93249,7 @@
$as_echo "no" >&6; }
fi
-@@ -88198,7 +39018,7 @@
+@@ -88127,7 +38972,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -93264,7 +93258,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -88208,11 +39028,7 @@
+@@ -88137,11 +38982,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -93277,7 +93271,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88229,42 +39045,15 @@
+@@ -88158,42 +38999,15 @@
return 0;
}
_ACEOF
@@ -93323,7 +93317,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88276,11 +39065,7 @@
+@@ -88205,11 +39019,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -93336,7 +93330,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88297,42 +39082,15 @@
+@@ -88226,42 +39036,15 @@
return 0;
}
_ACEOF
@@ -93382,7 +93376,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88347,11 +39105,7 @@
+@@ -88276,11 +39059,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -93395,7 +93389,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88368,42 +39122,15 @@
+@@ -88297,42 +39076,15 @@
return 0;
}
_ACEOF
@@ -93441,7 +93435,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88415,11 +39142,7 @@
+@@ -88344,11 +39096,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -93454,7 +93448,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88436,42 +39159,15 @@
+@@ -88365,42 +39113,15 @@
return 0;
}
_ACEOF
@@ -93500,7 +93494,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88501,11 +39197,7 @@
+@@ -88430,11 +39151,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -93513,7 +93507,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88522,64 +39214,37 @@
+@@ -88451,64 +39168,37 @@
return 0;
}
_ACEOF
@@ -93586,7 +93580,7 @@
$as_echo "$merged_build_possible" >&6; }
# Enable merged build automatically if possible, when in developer mode
-@@ -88635,9 +39300,9 @@
+@@ -88564,9 +39254,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
@@ -93598,7 +93592,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -88650,14 +39315,14 @@
+@@ -88579,14 +39269,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93616,7 +93610,7 @@
IFS=$as_save_IFS
;;
-@@ -88665,10 +39330,10 @@
+@@ -88594,10 +39284,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -93629,7 +93623,7 @@
$as_echo "no" >&6; }
fi
-@@ -88679,9 +39344,9 @@
+@@ -88608,9 +39298,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
@@ -93641,7 +93635,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -88694,14 +39359,14 @@
+@@ -88623,14 +39313,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93659,7 +93653,7 @@
IFS=$as_save_IFS
;;
-@@ -88709,10 +39374,10 @@
+@@ -88638,10 +39328,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -93672,7 +93666,7 @@
$as_echo "no" >&6; }
fi
-@@ -88720,7 +39385,7 @@
+@@ -88649,7 +39339,7 @@
fi
if test -z "$PYTHON"; then
working_python=no
@@ -93681,7 +93675,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -88731,9 +39396,9 @@
+@@ -88660,9 +39350,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
@@ -93693,7 +93687,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -88746,14 +39411,14 @@
+@@ -88675,14 +39365,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93711,7 +93705,7 @@
IFS=$as_save_IFS
;;
-@@ -88761,10 +39426,10 @@
+@@ -88690,10 +39380,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -93724,7 +93718,7 @@
$as_echo "no" >&6; }
fi
-@@ -88775,9 +39440,9 @@
+@@ -88704,9 +39394,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
@@ -93736,7 +93730,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -88790,14 +39455,14 @@
+@@ -88719,14 +39409,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -93754,7 +93748,7 @@
IFS=$as_save_IFS
;;
-@@ -88805,10 +39470,10 @@
+@@ -88734,10 +39424,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -93767,7 +93761,7 @@
$as_echo "no" >&6; }
fi
-@@ -88816,7 +39481,7 @@
+@@ -88745,7 +39435,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -93776,7 +93770,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -88826,11 +39491,7 @@
+@@ -88755,11 +39445,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -93789,7 +93783,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88847,42 +39508,15 @@
+@@ -88776,42 +39462,15 @@
return 0;
}
_ACEOF
@@ -93835,7 +93829,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88894,11 +39528,7 @@
+@@ -88823,11 +39482,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -93848,7 +93842,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88915,42 +39545,15 @@
+@@ -88844,42 +39499,15 @@
return 0;
}
_ACEOF
@@ -93894,7 +93888,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -88965,11 +39568,7 @@
+@@ -88894,11 +39522,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -93907,7 +93901,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -88986,42 +39585,15 @@
+@@ -88915,42 +39539,15 @@
return 0;
}
_ACEOF
@@ -93953,7 +93947,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -89033,11 +39605,7 @@
+@@ -88962,11 +39559,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -93966,7 +93960,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -89054,42 +39622,15 @@
+@@ -88983,42 +39576,15 @@
return 0;
}
_ACEOF
@@ -94012,7 +94006,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -89119,11 +39660,7 @@
+@@ -89048,11 +39614,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -94025,7 +94019,7 @@
/* end confdefs.h. */
#undef HAVE_UINTPTR_T
-@@ -89140,52 +39677,25 @@
+@@ -89069,52 +39631,25 @@
return 0;
}
_ACEOF
@@ -94083,7 +94077,7 @@
$as_echo "yes" >&6; }
-@@ -89213,20 +39723,18 @@
+@@ -89142,20 +39677,18 @@
else
@@ -94108,7 +94102,7 @@
$as_echo "$pythondir" >&6; }
-@@ -89241,553 +39749,133 @@
+@@ -89170,553 +39703,133 @@
@@ -94749,7 +94743,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89805,63 +39893,32 @@
+@@ -89734,63 +39847,32 @@
return 0;
}
_ACEOF
@@ -94824,7 +94818,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89879,43 +39936,18 @@
+@@ -89808,43 +39890,18 @@
return 0;
}
_ACEOF
@@ -94874,7 +94868,7 @@
TERMLIBS="-lreadline $TERMLIBS"
EXTERNAL_READLINE=yes
break
-@@ -89929,11 +39961,11 @@
+@@ -89858,11 +39915,11 @@
;;
no)
@@ -94888,7 +94882,7 @@
$as_echo "yes" >&6; }
# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -89945,151 +39977,12 @@
+@@ -89874,151 +39931,12 @@
LDFLAGS="-L$with_readline/lib $LDFLAGS"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
@@ -95046,7 +95040,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -90098,151 +39991,12 @@
+@@ -90027,151 +39945,12 @@
done
@@ -95203,7 +95197,7 @@
_ACEOF
fi
-@@ -90250,168 +40004,26 @@
+@@ -90179,168 +39958,26 @@
done
@@ -95381,7 +95375,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -90429,63 +40041,32 @@
+@@ -90358,63 +39995,32 @@
return 0;
}
_ACEOF
@@ -95456,7 +95450,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -90503,43 +40084,18 @@
+@@ -90432,43 +40038,18 @@
return 0;
}
_ACEOF
@@ -95506,7 +95500,7 @@
TERMLDFLAGS="-L$with_readline/lib"
TERMCPPFLAGS="-I$with_readline/include"
LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -90559,7 +40115,7 @@
+@@ -90488,7 +40069,7 @@
;;
esac
else
@@ -95515,7 +95509,7 @@
$as_echo "no" >&6; }
fi
-@@ -90568,18 +40124,14 @@
+@@ -90497,18 +40078,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.
@@ -95537,7 +95531,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -90592,142 +40144,53 @@
+@@ -90521,142 +40098,53 @@
int
main ()
{
@@ -95711,7 +95705,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -90745,60 +40208,31 @@
+@@ -90674,60 +40162,31 @@
return 0;
}
_ACEOF
@@ -95782,7 +95776,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -90853,7 +40287,7 @@
+@@ -90782,7 +40241,7 @@
###################################
"
@@ -95791,7 +95785,7 @@
$as_echo "no" >&6; }
fi
-@@ -90862,102 +40296,9 @@
+@@ -90791,102 +40250,9 @@
@@ -95896,7 +95890,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -90966,102 +40307,9 @@
+@@ -90895,102 +40261,9 @@
fi
@@ -96001,7 +95995,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -91071,151 +40319,12 @@
+@@ -91000,151 +40273,12 @@
fi
@@ -96157,7 +96151,7 @@
_ACEOF
else
-@@ -91225,151 +40334,12 @@
+@@ -91154,151 +40288,12 @@
done
@@ -96313,7 +96307,7 @@
_ACEOF
else
-@@ -91379,29 +40349,6 @@
+@@ -91308,29 +40303,6 @@
done
@@ -96343,7 +96337,7 @@
for ac_header in \
crypt.h \
curses.h \
-@@ -91427,147 +40374,11 @@
+@@ -91356,147 +40328,11 @@
netinet6/in6.h \
libintl.h
@@ -96496,7 +96490,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -91577,42 +40388,6 @@
+@@ -91506,42 +40342,6 @@
done
@@ -96539,7 +96533,7 @@
for ac_func in \
atexit \
cgetent \
-@@ -91645,271 +40420,65 @@
+@@ -91574,271 +40374,65 @@
warn \
errx \
warnx \
@@ -96848,7 +96842,7 @@
_ACEOF
fi
-@@ -91925,11 +40494,11 @@
+@@ -91854,11 +40448,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -96862,7 +96856,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -91939,17 +40508,13 @@
+@@ -91868,17 +40462,13 @@
@@ -96883,7 +96877,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_BSWAP_H
#include <sys/bswap.h>
-@@ -91962,140 +40527,25 @@
+@@ -91891,140 +40481,25 @@
return 0;
}
_ACEOF
@@ -97033,7 +97027,7 @@
_ACEOF
fi
-@@ -92111,11 +40561,11 @@
+@@ -92040,11 +40515,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -97047,7 +97041,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -92126,25 +40576,21 @@
+@@ -92055,25 +40530,21 @@
@@ -97077,7 +97071,7 @@
ac_cv_struct_winsize=yes; break
fi
rm -f conftest*
-@@ -92154,63 +40600,45 @@
+@@ -92083,63 +40554,45 @@
if test "$ac_cv_struct_winsize" = "yes"; then
@@ -97152,7 +97146,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -92223,35 +40651,14 @@
+@@ -92152,35 +40605,14 @@
return 0;
}
_ACEOF
@@ -97191,7 +97185,7 @@
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -92261,9 +40668,7 @@
+@@ -92190,9 +40622,7 @@
if test "$ac_cv_type_signal" = "void" ; then
@@ -97202,7 +97196,7 @@
fi
-@@ -92294,18 +40699,14 @@
+@@ -92223,18 +40653,14 @@
@@ -97224,7 +97218,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -92322,44 +40723,15 @@
+@@ -92251,44 +40677,15 @@
return 0;
}
_ACEOF
@@ -97274,7 +97268,7 @@
/* end confdefs.h. */
extern int h_errno;
int foo(void) { return h_errno; }
-@@ -92371,44 +40743,19 @@
+@@ -92300,44 +40697,19 @@
return 0;
}
_ACEOF
@@ -97324,7 +97318,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -92416,81 +40763,23 @@
+@@ -92345,81 +40717,23 @@
#define HAVE_H_ERRNO 1
_ACEOF
@@ -97412,7 +97406,7 @@
fi
-@@ -92506,151 +40795,12 @@
+@@ -92435,151 +40749,12 @@
@@ -97569,7 +97563,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -92662,23 +40812,17 @@
+@@ -92591,23 +40766,17 @@
@@ -97596,7 +97590,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92696,54 +40840,28 @@
+@@ -92625,54 +40794,28 @@
return 0;
}
_ACEOF
@@ -97658,7 +97652,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUTIL 1
_ACEOF
-@@ -92760,7 +40878,6 @@
+@@ -92689,7 +40832,6 @@
fi
@@ -97666,7 +97660,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
OPENPTY_ENABLE = YES
"
-@@ -92780,23 +40897,17 @@
+@@ -92709,23 +40851,17 @@
@@ -97693,7 +97687,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92814,54 +40925,28 @@
+@@ -92743,54 +40879,28 @@
return 0;
}
_ACEOF
@@ -97755,7 +97749,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
-@@ -92878,7 +40963,6 @@
+@@ -92807,7 +40917,6 @@
fi
@@ -97763,7 +97757,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
INTL_ENABLE = YES
"
-@@ -92902,150 +40986,12 @@
+@@ -92831,150 +40940,12 @@
@@ -97919,7 +97913,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -93055,22 +41001,9 @@
+@@ -92984,22 +40955,9 @@
done
@@ -97944,7 +97938,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -93081,46 +41014,10 @@
+@@ -93010,46 +40968,10 @@
#include <arpa/nameser.h>
#endif
@@ -97994,7 +97988,7 @@
_ACEOF
fi
-@@ -93132,9 +41029,9 @@
+@@ -93061,9 +40983,9 @@
@@ -98006,7 +98000,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93149,11 +41046,7 @@
+@@ -93078,11 +41000,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -98019,7 +98013,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -93175,148 +41068,31 @@
+@@ -93104,148 +41022,31 @@
{
res_search(0,0,0,0,0)
;
@@ -98189,7 +98183,7 @@
_ACEOF
fi
-@@ -93336,13 +41112,13 @@
+@@ -93265,13 +41066,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -98205,7 +98199,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -93356,7 +41132,7 @@
+@@ -93285,7 +41086,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -98214,7 +98208,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -93371,9 +41147,9 @@
+@@ -93300,9 +41101,9 @@
@@ -98226,7 +98220,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93388,11 +41164,7 @@
+@@ -93317,11 +41118,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -98239,7 +98233,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -93417,38 +41189,11 @@
+@@ -93346,38 +41143,11 @@
return 0;
}
_ACEOF
@@ -98281,7 +98275,7 @@
done
eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
LIBS="$ac_save_LIBS"
-@@ -93460,102 +41205,12 @@
+@@ -93389,102 +41159,12 @@
eval "ac_res=\$ac_cv_funclib_res_nsearch"
if false; then
@@ -98389,7 +98383,7 @@
_ACEOF
fi
-@@ -93575,13 +41230,13 @@
+@@ -93504,13 +41184,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -98405,7 +98399,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -93595,7 +41250,7 @@
+@@ -93524,7 +41204,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -98414,7 +98408,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -93610,9 +41265,9 @@
+@@ -93539,9 +41219,9 @@
@@ -98426,7 +98420,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93627,11 +41282,7 @@
+@@ -93556,11 +41236,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -98439,7 +98433,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -93656,38 +41307,11 @@
+@@ -93585,38 +41261,11 @@
return 0;
}
_ACEOF
@@ -98481,7 +98475,7 @@
done
eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
LIBS="$ac_save_LIBS"
-@@ -93699,102 +41323,12 @@
+@@ -93628,102 +41277,12 @@
eval "ac_res=\$ac_cv_funclib_res_ndestroy"
if false; then
@@ -98589,7 +98583,7 @@
_ACEOF
fi
-@@ -93814,13 +41348,13 @@
+@@ -93743,13 +41302,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -98605,7 +98599,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -93834,7 +41368,7 @@
+@@ -93763,7 +41322,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -98614,7 +98608,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -93848,9 +41382,9 @@
+@@ -93777,9 +41336,9 @@
@@ -98626,7 +98620,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -93865,11 +41399,7 @@
+@@ -93794,11 +41353,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -98639,7 +98633,7 @@
/* end confdefs.h. */
#ifdef HAVE_DNS_H
-@@ -93884,38 +41414,11 @@
+@@ -93813,38 +41368,11 @@
return 0;
}
_ACEOF
@@ -98681,7 +98675,7 @@
done
eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}"
LIBS="$ac_save_LIBS"
-@@ -93927,102 +41430,12 @@
+@@ -93856,102 +41384,12 @@
eval "ac_res=\$ac_cv_funclib_dns_search"
if false; then
@@ -98789,7 +98783,7 @@
_ACEOF
fi
-@@ -94042,13 +41455,13 @@
+@@ -93971,13 +41409,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -98805,7 +98799,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -94062,7 +41475,7 @@
+@@ -93991,7 +41429,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -98814,7 +98808,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -94074,9 +41487,9 @@
+@@ -94003,9 +41441,9 @@
@@ -98826,7 +98820,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -94091,11 +41504,7 @@
+@@ -94020,11 +41458,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -98839,7 +98833,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -94120,38 +41529,11 @@
+@@ -94049,38 +41483,11 @@
return 0;
}
_ACEOF
@@ -98881,7 +98875,7 @@
done
eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
LIBS="$ac_save_LIBS"
-@@ -94163,102 +41545,12 @@
+@@ -94092,102 +41499,12 @@
eval "ac_res=\$ac_cv_funclib_dn_expand"
if false; then
@@ -98989,7 +98983,7 @@
_ACEOF
fi
-@@ -94278,13 +41570,13 @@
+@@ -94207,13 +41524,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -99005,7 +98999,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -94298,7 +41590,7 @@
+@@ -94227,7 +41544,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -99014,7 +99008,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -94310,18 +41602,14 @@
+@@ -94239,18 +41556,14 @@
@@ -99036,7 +99030,7 @@
/* end confdefs.h. */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -94345,44 +41633,15 @@
+@@ -94274,44 +41587,15 @@
return 0;
}
_ACEOF
@@ -99086,7 +99080,7 @@
/* end confdefs.h. */
extern int _res;
int foo(void) { return _res; }
-@@ -94394,44 +41653,19 @@
+@@ -94323,44 +41607,19 @@
return 0;
}
_ACEOF
@@ -99136,7 +99130,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -94439,18 +41673,7 @@
+@@ -94368,18 +41627,7 @@
#define HAVE__RES 1
_ACEOF
@@ -99156,7 +99150,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -94463,64 +41686,17 @@
+@@ -94392,64 +41640,17 @@
#ifdef HAVE_RESOLV_H
#include <resolv.h>
#endif
@@ -99226,7 +99220,7 @@
fi
-@@ -94586,9 +41762,9 @@
+@@ -94515,9 +41716,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
@@ -99238,7 +99232,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -94599,24 +41775,24 @@
+@@ -94528,24 +41729,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99268,7 +99262,7 @@
$as_echo "no" >&6; }
fi
-@@ -94645,20 +41821,20 @@
+@@ -94574,20 +41775,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -99296,7 +99290,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -94667,19 +41843,17 @@
+@@ -94596,19 +41797,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
@@ -99320,7 +99314,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -94687,55 +41861,29 @@
+@@ -94616,55 +41815,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -99384,7 +99378,7 @@
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -94744,52 +41892,24 @@
+@@ -94673,52 +41846,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -99444,7 +99438,7 @@
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -94799,9 +41919,9 @@
+@@ -94728,9 +41873,9 @@
if test x"$LEX_BASENAME" = x"flex"; then
# "flex 2.5.33"
FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -99456,7 +99450,7 @@
$as_echo "$FLEX_VERSION" >&6; }
FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -94814,9 +41934,9 @@
+@@ -94743,9 +41888,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
@@ -99468,7 +99462,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -94827,24 +41947,24 @@
+@@ -94756,24 +41901,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99498,7 +99492,7 @@
$as_echo "no" >&6; }
fi
-@@ -94857,9 +41977,9 @@
+@@ -94786,9 +41931,9 @@
if test x"$YACC_BASENAME" = x"bison -y"; then
# bison (GNU Bison) 2.3
BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -99510,7 +99504,7 @@
$as_echo "$BISON_VERSION" >&6; }
BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -94867,7 +41987,7 @@
+@@ -94796,7 +41941,7 @@
YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
fi
@@ -99519,7 +99513,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
-@@ -94883,7 +42003,7 @@
+@@ -94812,7 +41957,7 @@
LEX=false
YACC=false
fi
@@ -99528,7 +99522,7 @@
$as_echo "$LEX_YACC" >&6; }
# Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -94891,21 +42011,15 @@
+@@ -94820,21 +41965,15 @@
# if we ever get to using a host kerberos, we might add conditionals here
@@ -99553,7 +99547,7 @@
HAVE_GSSAPI=YES
-@@ -94985,193 +42099,48 @@
+@@ -94914,193 +42053,48 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";"
@@ -99775,7 +99769,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -95189,46 +42158,15 @@
+@@ -95118,46 +42112,15 @@
return 0;
}
_ACEOF
@@ -99826,7 +99820,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -95246,65 +42184,32 @@
+@@ -95175,65 +42138,32 @@
return 0;
}
_ACEOF
@@ -99900,7 +99894,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. */
-@@ -95345,43 +42250,18 @@
+@@ -95274,43 +42204,18 @@
return 0;
}
_ACEOF
@@ -99950,7 +99944,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BACKTRACE 1
_ACEOF
-@@ -95389,7 +42269,6 @@
+@@ -95318,7 +42223,6 @@
fi
@@ -99958,7 +99952,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
-@@ -95475,102 +42354,12 @@
+@@ -95404,102 +42308,12 @@
@@ -100066,7 +100060,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -95579,102 +42368,12 @@
+@@ -95508,102 +42322,12 @@
done
@@ -100173,7 +100167,7 @@
_ACEOF
fi
-@@ -95683,153 +42382,14 @@
+@@ -95612,153 +42336,14 @@
#################################################
# these tests are taken from the GNU fileutils package
@@ -100333,7 +100327,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -95839,65 +42399,16 @@
+@@ -95768,65 +42353,16 @@
done
@@ -100404,7 +100398,7 @@
_ACEOF
fi
-@@ -95910,19 +42421,15 @@
+@@ -95839,19 +42375,15 @@
# Test for statvfs64.
if test $space = no; then
# SVR4
@@ -100428,7 +100422,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -95936,51 +42443,22 @@
+@@ -95865,51 +42397,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -100486,7 +100480,7 @@
fi
fi
-@@ -95993,16 +42471,12 @@
+@@ -95922,16 +42425,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -100506,7 +100500,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -96014,64 +42488,33 @@
+@@ -95943,64 +42442,33 @@
return 0;
}
_ACEOF
@@ -100580,7 +100574,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -96083,59 +42526,32 @@
+@@ -96012,59 +42480,32 @@
return 0;
}
_ACEOF
@@ -100648,7 +100642,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -96148,71 +42564,38 @@
+@@ -96077,71 +42518,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -100730,7 +100724,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -96231,71 +42614,38 @@
+@@ -96160,71 +42568,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -100812,7 +100806,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -96305,71 +42655,38 @@
+@@ -96234,71 +42609,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -100894,7 +100888,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -96385,71 +42702,38 @@
+@@ -96314,71 +42656,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -100976,7 +100970,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -96469,201 +42753,33 @@
+@@ -96398,201 +42707,33 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -101201,7 +101195,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -96672,19 +42788,15 @@
+@@ -96601,19 +42742,15 @@
done
@@ -101224,7 +101218,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96702,46 +42814,15 @@
+@@ -96631,46 +42768,15 @@
return 0;
}
_ACEOF
@@ -101275,7 +101269,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96759,65 +42840,32 @@
+@@ -96688,65 +42794,32 @@
return 0;
}
_ACEOF
@@ -101349,7 +101343,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. */
-@@ -96858,50 +42906,24 @@
+@@ -96787,50 +42860,24 @@
return 0;
}
_ACEOF
@@ -101406,7 +101400,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
XATTR_LIBS = ${XATTR_LIBS}
XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -96911,18 +42933,14 @@
+@@ -96840,18 +42887,14 @@
if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -101428,7 +101422,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -96945,48 +42963,23 @@
+@@ -96874,48 +42917,23 @@
return 0;
}
_ACEOF
@@ -101482,7 +101476,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -96998,20 +42991,16 @@
+@@ -96927,20 +42945,16 @@
fi
@@ -101507,7 +101501,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/capability.h>
-@@ -97026,117 +43015,55 @@
+@@ -96955,117 +42969,55 @@
}
_ACEOF
@@ -101641,7 +101635,7 @@
fi
-@@ -97144,7 +43071,7 @@
+@@ -97073,7 +43025,7 @@
INCLUDED_POPT=auto
# Check whether --with-included-popt was given.
@@ -101650,7 +101644,7 @@
withval=$with_included_popt; INCLUDED_POPT=$withval
fi
-@@ -97153,169 +43080,26 @@
+@@ -97082,169 +43034,26 @@
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -101828,7 +101822,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97333,43 +43117,18 @@
+@@ -97262,43 +43071,18 @@
return 0;
}
_ACEOF
@@ -101878,7 +101872,7 @@
POPT_LIBS="-lpopt"
fi
-@@ -97381,9 +43140,9 @@
+@@ -97310,9 +43094,9 @@
fi
fi
@@ -101890,7 +101884,7 @@
$as_echo "$INCLUDED_POPT" >&6; }
if test x"$INCLUDED_POPT" != x"no"; then
poptdir=""
-@@ -97397,156 +43156,16 @@
+@@ -97326,156 +43110,16 @@
fi
done
if test x"$poptdir" = "x"; then
@@ -102054,7 +102048,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -97585,12 +43204,10 @@
+@@ -97514,12 +43158,10 @@
LOOK_DIRS="/usr /usr/local /sw"
# Check whether --with-libiconv was given.
@@ -102069,7 +102063,7 @@
else
if test "$withval" != "yes" ; then
-@@ -97602,26 +43219,20 @@
+@@ -97531,26 +43173,20 @@
LIBS=-liconv
@@ -102104,7 +102098,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -97634,33 +43245,10 @@
+@@ -97563,33 +43199,10 @@
}
_ACEOF
@@ -102141,7 +102135,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97668,29 +43256,17 @@
+@@ -97597,29 +43210,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -102176,7 +102170,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -97703,33 +43279,10 @@
+@@ -97632,33 +43233,10 @@
}
_ACEOF
@@ -102213,7 +102207,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97737,28 +43290,17 @@
+@@ -97666,28 +43244,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -102248,7 +102242,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -97771,33 +43313,10 @@
+@@ -97700,33 +43267,10 @@
}
_ACEOF
@@ -102285,7 +102279,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97805,31 +43324,22 @@
+@@ -97734,31 +43278,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -102323,7 +102317,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -97842,17 +43352,13 @@
+@@ -97771,17 +43306,13 @@
if test x$ICONV_FOUND = xno; then
@@ -102345,7 +102339,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -97865,49 +43371,20 @@
+@@ -97794,49 +43325,20 @@
}
_ACEOF
@@ -102401,7 +102395,7 @@
fi
for i in $LOOK_DIRS ; do
-@@ -97924,24 +43401,20 @@
+@@ -97853,24 +43355,20 @@
LIBS=-liconv
@@ -102433,7 +102427,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -97954,33 +43427,10 @@
+@@ -97883,33 +43381,10 @@
}
_ACEOF
@@ -102470,7 +102464,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -97988,27 +43438,17 @@
+@@ -97917,27 +43392,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -102502,7 +102496,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -98021,33 +43461,10 @@
+@@ -97950,33 +43415,10 @@
}
_ACEOF
@@ -102539,7 +102533,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -98055,26 +43472,17 @@
+@@ -97984,26 +43426,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -102571,7 +102565,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -98086,304 +43494,92 @@
+@@ -98015,304 +43448,92 @@
return 0;
}
@@ -102943,7 +102937,7 @@
_ACEOF
fi
-@@ -98462,151 +43658,12 @@
+@@ -98391,151 +43612,12 @@
@@ -103099,7 +103093,7 @@
_ACEOF
fi
-@@ -98616,23 +43673,17 @@
+@@ -98545,23 +43627,17 @@
@@ -103126,7 +103120,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98650,54 +43701,28 @@
+@@ -98579,54 +43655,28 @@
return 0;
}
_ACEOF
@@ -103188,7 +103182,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -98713,18 +43738,13 @@
+@@ -98642,18 +43692,13 @@
fi
@@ -103210,7 +103204,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -98742,40 +43762,19 @@
+@@ -98671,40 +43716,19 @@
return 0;
}
_ACEOF
@@ -103253,7 +103247,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -98834,9 +43833,9 @@
+@@ -98763,9 +43787,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
@@ -103265,7 +103259,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -98849,14 +43848,14 @@
+@@ -98778,14 +43802,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -103283,7 +103277,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -98865,10 +43864,10 @@
+@@ -98794,10 +43818,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -103296,7 +103290,7 @@
$as_echo "no" >&6; }
fi
-@@ -98884,52 +43883,27 @@
+@@ -98813,52 +43837,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -103356,7 +103350,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTALLOC_ENABLE = YES
-@@ -98937,22 +43911,16 @@
+@@ -98866,22 +43865,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBTALLOC\"} = \"YES\";"
@@ -103383,7 +103377,7 @@
CFLAGS="$OLD_CFLAGS"
ac_cv_LIBTALLOC_libs_only_other="`$PKG_CONFIG --libs-only-other 'talloc >= 2.0.1'` `$PKG_CONFIG --libs-only-L 'talloc >= 2.0.1'`"
-@@ -99013,7 +43981,7 @@
+@@ -98942,7 +43935,7 @@
ac_cv_LIBTALLOC_found=yes
else
@@ -103392,7 +103386,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.1'
ac_cv_LIBTALLOC_found=no
-@@ -99047,9 +44015,9 @@
+@@ -98976,9 +43969,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
@@ -103404,7 +103398,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -99062,14 +44030,14 @@
+@@ -98991,14 +43984,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -103422,7 +103416,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99078,10 +44046,10 @@
+@@ -99007,10 +44000,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -103435,7 +103429,7 @@
$as_echo "no" >&6; }
fi
-@@ -99097,52 +44065,27 @@
+@@ -99026,52 +44019,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -103495,7 +103489,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTDB_ENABLE = YES
-@@ -99150,22 +44093,16 @@
+@@ -99079,22 +44047,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBTDB\"} = \"YES\";"
@@ -103522,7 +103516,7 @@
CFLAGS="$OLD_CFLAGS"
ac_cv_LIBTDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'tdb >= 1.2.1'` `$PKG_CONFIG --libs-only-L 'tdb >= 1.2.1'`"
-@@ -99226,7 +44163,7 @@
+@@ -99155,7 +44117,7 @@
ac_cv_LIBTDB_found=yes
else
@@ -103531,7 +103525,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.2.1'
ac_cv_LIBTDB_found=no
-@@ -99251,9 +44188,7 @@
+@@ -99180,9 +44142,7 @@
fi
done
if test x"$tdbdir" = "x"; then
@@ -103542,7 +103536,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"
-@@ -99266,104 +44201,12 @@
+@@ -99195,104 +44155,12 @@
TDB_CFLAGS="-I$tdbdir/include"
@@ -103652,7 +103646,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -99371,151 +44214,12 @@
+@@ -99300,151 +44168,12 @@
fi
done
@@ -103809,7 +103803,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -99526,17 +44230,13 @@
+@@ -99455,17 +44184,13 @@
@@ -103830,7 +103824,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -99547,56 +44247,29 @@
+@@ -99476,56 +44201,29 @@
return 0;
}
_ACEOF
@@ -103894,7 +103888,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -99607,41 +44280,18 @@
+@@ -99536,41 +44234,18 @@
return 0;
}
_ACEOF
@@ -103940,7 +103934,7 @@
fi
-@@ -99672,9 +44322,9 @@
+@@ -99601,9 +44276,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
@@ -103952,7 +103946,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -99687,14 +44337,14 @@
+@@ -99616,14 +44291,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -103970,7 +103964,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -99703,10 +44353,10 @@
+@@ -99632,10 +44307,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -103983,7 +103977,7 @@
$as_echo "no" >&6; }
fi
-@@ -99722,52 +44372,27 @@
+@@ -99651,52 +44326,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104043,7 +104037,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTEVENT_ENABLE = YES
-@@ -99775,22 +44400,16 @@
+@@ -99704,22 +44354,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBTEVENT\"} = \"YES\";"
@@ -104070,7 +104064,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'`"
-@@ -99851,7 +44470,7 @@
+@@ -99780,7 +44424,7 @@
ac_cv_LIBTEVENT_found=yes
else
@@ -104079,7 +104073,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = 0.9.8'
ac_cv_LIBTEVENT_found=no
-@@ -99872,281 +44491,50 @@
+@@ -99801,281 +44445,50 @@
if test x"$teventdir" = "x"; then
teventdir=""
@@ -104392,7 +104386,7 @@
_ACEOF
fi
-@@ -100155,9 +44543,7 @@
+@@ -100084,9 +44497,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"
@@ -104403,7 +104397,7 @@
fi
-@@ -100213,9 +44599,9 @@
+@@ -100142,9 +44553,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
@@ -104415,7 +104409,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -100228,14 +44614,14 @@
+@@ -100157,14 +44568,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -104433,7 +104427,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -100244,10 +44630,10 @@
+@@ -100173,10 +44584,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -104446,7 +104440,7 @@
$as_echo "no" >&6; }
fi
-@@ -100263,52 +44649,27 @@
+@@ -100192,52 +44603,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104506,7 +104500,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBLDB_ENABLE = YES
-@@ -100316,22 +44677,16 @@
+@@ -100245,22 +44631,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"LIBLDB\"} = \"YES\";"
@@ -104533,7 +104527,7 @@
CFLAGS="$OLD_CFLAGS"
ac_cv_LIBLDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'ldb = 0.9.10'` `$PKG_CONFIG --libs-only-L 'ldb = 0.9.10'`"
-@@ -100392,7 +44747,7 @@
+@@ -100321,7 +44701,7 @@
ac_cv_LIBLDB_found=yes
else
@@ -104542,7 +104536,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.10'
ac_cv_LIBLDB_found=no
-@@ -100438,12 +44793,12 @@
+@@ -100367,12 +44747,12 @@
SQLITE3_LIBS=""
with_sqlite3_support=no
@@ -104557,7 +104551,7 @@
withval=$with_sqlite3; case "$withval" in
yes|no|auto)
with_sqlite3_support=$withval
-@@ -100452,157 +44807,18 @@
+@@ -100381,157 +44761,18 @@
fi
@@ -104721,7 +104715,7 @@
_ACEOF
fi
-@@ -100612,11 +44828,9 @@
+@@ -100541,11 +44782,9 @@
if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
if test x"$with_sqlite3_support" = x"yes"; then
@@ -104735,7 +104729,7 @@
$as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
fi
-@@ -100631,23 +44845,17 @@
+@@ -100560,23 +44799,17 @@
# now see if we can find the sqlite3 libs in standard paths
@@ -104762,7 +104756,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -100665,54 +44873,28 @@
+@@ -100594,54 +44827,28 @@
return 0;
}
_ACEOF
@@ -104824,7 +104818,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF
-@@ -100728,21 +44910,16 @@
+@@ -100657,21 +44864,16 @@
fi
@@ -104850,7 +104844,7 @@
$as_echo "yes" >&6; }
with_sqlite3_support=yes
-@@ -100754,11 +44931,9 @@
+@@ -100683,11 +44885,9 @@
else
if test x"$with_sqlite3_support" = x"yes"; then
@@ -104864,7 +104858,7 @@
$as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
fi
-@@ -100828,7 +45003,7 @@
+@@ -100757,7 +44957,7 @@
use_gnutls=auto
# Check whether --enable-gnutls was given.
@@ -104873,7 +104867,7 @@
enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
use_gnutls=no
fi
-@@ -100842,9 +45017,9 @@
+@@ -100771,9 +44971,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
@@ -104885,7 +104879,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -100857,14 +45032,14 @@
+@@ -100786,14 +44986,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -104903,7 +104897,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -100873,10 +45048,10 @@
+@@ -100802,10 +45002,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -104916,7 +104910,7 @@
$as_echo "no" >&6; }
fi
-@@ -100892,52 +45067,27 @@
+@@ -100821,52 +45021,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -104976,7 +104970,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GNUTLS_ENABLE = YES
-@@ -100945,22 +45095,16 @@
+@@ -100874,22 +45049,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{\"GNUTLS\"} = \"YES\";"
@@ -105003,7 +104997,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'`"
-@@ -101021,7 +45165,7 @@
+@@ -100950,7 +45119,7 @@
ac_cv_GNUTLS_found=yes
else
@@ -105012,7 +105006,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls >= 1.4.0'
ac_cv_GNUTLS_found=no
-@@ -101041,151 +45185,12 @@
+@@ -100970,151 +45139,12 @@
fi
if test x$use_gnutls = xauto; then
@@ -105169,7 +105163,7 @@
_ACEOF
fi
-@@ -101194,23 +45199,17 @@
+@@ -101123,23 +45153,17 @@
@@ -105196,7 +105190,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101228,580 +45227,116 @@
+@@ -101157,580 +45181,116 @@
return 0;
}
_ACEOF
@@ -105856,7 +105850,7 @@
_ACEOF
fi
-@@ -101810,23 +45345,17 @@
+@@ -101739,23 +45299,17 @@
@@ -105883,7 +105877,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -101844,54 +45373,28 @@
+@@ -101773,54 +45327,28 @@
return 0;
}
_ACEOF
@@ -105945,7 +105939,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGCRYPT 1
_ACEOF
-@@ -101907,7 +45410,6 @@
+@@ -101836,7 +45364,6 @@
fi
@@ -105953,7 +105947,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GCRYPT_LIBS = $GCRYPT_LIBS
GCRYPT_CFLAGS =
-@@ -101924,7 +45426,7 @@
+@@ -101853,7 +45380,7 @@
use_netapi=auto
# Check whether --enable-netapi was given.
@@ -105962,7 +105956,7 @@
enableval=$enable_netapi; if test x$enable_netapi = xno; then
use_netapi=no
fi
-@@ -101946,151 +45448,12 @@
+@@ -101875,151 +45402,12 @@
\$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";"
if test x$use_netapi != xno; then
@@ -106119,7 +106113,7 @@
_ACEOF
fi
-@@ -102099,23 +45462,17 @@
+@@ -102028,23 +45416,17 @@
@@ -106146,7 +106140,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102133,54 +45490,28 @@
+@@ -102062,54 +45444,28 @@
return 0;
}
_ACEOF
@@ -106208,7 +106202,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -102197,24 +45528,17 @@
+@@ -102126,24 +45482,17 @@
fi
@@ -106236,7 +106230,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102232,54 +45556,28 @@
+@@ -102161,54 +45510,28 @@
return 0;
}
_ACEOF
@@ -106298,7 +106292,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -102296,24 +45594,17 @@
+@@ -102225,24 +45548,17 @@
fi
@@ -106326,7 +106320,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102331,54 +45622,28 @@
+@@ -102260,54 +45576,28 @@
return 0;
}
_ACEOF
@@ -106388,7 +106382,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -102395,24 +45660,17 @@
+@@ -102324,24 +45614,17 @@
fi
@@ -106416,7 +106410,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102430,54 +45688,28 @@
+@@ -102359,54 +45642,28 @@
return 0;
}
_ACEOF
@@ -106478,7 +106472,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -102494,24 +45726,17 @@
+@@ -102423,24 +45680,17 @@
fi
@@ -106506,7 +106500,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102529,54 +45754,28 @@
+@@ -102458,54 +45708,28 @@
return 0;
}
_ACEOF
@@ -106568,7 +106562,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNETAPI 1
_ACEOF
-@@ -102591,12 +45790,9 @@
+@@ -102520,12 +45744,9 @@
fi
@@ -106582,7 +106576,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102614,9 +45810,7 @@
+@@ -102543,9 +45764,7 @@
else
if test x$use_netapi != xauto; then
@@ -106593,7 +106587,7 @@
fi
fi
-@@ -102657,19 +45851,17 @@
+@@ -102586,19 +45805,17 @@
#################################################
# check for pthread support
@@ -106617,7 +106611,7 @@
fi
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -102687,12 +45879,12 @@
+@@ -102616,12 +45833,12 @@
;;
*)
@@ -106632,7 +106626,7 @@
$as_echo "no" >&6; }
fi
-@@ -102708,274 +45900,45 @@
+@@ -102637,274 +45854,45 @@
@@ -106920,7 +106914,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -102993,54 +45956,28 @@
+@@ -102922,54 +45910,28 @@
return 0;
}
_ACEOF
@@ -106982,7 +106976,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSETPROCTITLE 1
_ACEOF
-@@ -103056,15 +45993,14 @@
+@@ -102985,15 +45947,14 @@
fi
@@ -107000,7 +106994,7 @@
$as_echo "yes" >&6; }
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103074,22 +46010,20 @@
+@@ -103003,22 +45964,20 @@
\$enabled{\"SETPROCTITLE\"} = \"YES\";"
@@ -107027,7 +107021,7 @@
$as_echo "no" >&6; }
fi
-@@ -103107,238 +46041,68 @@
+@@ -103036,238 +45995,68 @@
@@ -107296,7 +107290,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -103356,46 +46120,15 @@
+@@ -103285,46 +46074,15 @@
return 0;
}
_ACEOF
@@ -107347,7 +107341,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -103413,65 +46146,32 @@
+@@ -103342,65 +46100,32 @@
return 0;
}
_ACEOF
@@ -107421,7 +107415,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. */
-@@ -103512,50 +46212,24 @@
+@@ -103441,50 +46166,24 @@
return 0;
}
_ACEOF
@@ -107478,7 +107472,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
BLKID_LIBS = ${BLKID_LIBS}
BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -103566,9 +46240,7 @@
+@@ -103495,9 +46194,7 @@
if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
@@ -107489,7 +107483,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -103596,102 +46268,12 @@
+@@ -103525,102 +46222,12 @@
fi
@@ -107596,7 +107590,7 @@
_ACEOF
fi
-@@ -103701,151 +46283,12 @@
+@@ -103630,151 +46237,12 @@
###############################
# start SMB_EXT_LIB_PAM
# check for security/pam_appl.h and -lpam
@@ -107752,7 +107746,7 @@
_ACEOF
fi
-@@ -103854,23 +46297,17 @@
+@@ -103783,23 +46251,17 @@
@@ -107779,7 +107773,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -103888,54 +46325,28 @@
+@@ -103817,54 +46279,28 @@
return 0;
}
_ACEOF
@@ -107841,7 +107835,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -103950,7 +46361,6 @@
+@@ -103879,7 +46315,6 @@
fi
@@ -107849,7 +107843,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
-@@ -103976,23 +46386,17 @@
+@@ -103905,23 +46340,17 @@
# test for where we get crypt() from
@@ -107876,7 +107870,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -104010,54 +46414,28 @@
+@@ -103939,54 +46368,28 @@
return 0;
}
_ACEOF
@@ -107938,7 +107932,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
-@@ -104073,7 +46451,6 @@
+@@ -104002,7 +46405,6 @@
fi
@@ -107946,7 +107940,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
CRYPT_ENABLE = YES
"
-@@ -104090,102 +46467,12 @@
+@@ -104019,102 +46421,12 @@
@@ -108054,7 +108048,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -104194,151 +46481,12 @@
+@@ -104123,151 +46435,12 @@
done
@@ -108210,7 +108204,7 @@
_ACEOF
fi
-@@ -104347,23 +46495,17 @@
+@@ -104276,23 +46449,17 @@
@@ -108237,7 +108231,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -104381,54 +46523,28 @@
+@@ -104310,54 +46477,28 @@
return 0;
}
_ACEOF
@@ -108299,7 +108293,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSASL2 1
_ACEOF
-@@ -104444,7 +46560,6 @@
+@@ -104373,7 +46514,6 @@
fi
@@ -108307,7 +108301,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
-@@ -104490,312 +46605,88 @@
+@@ -104419,312 +46559,88 @@
ac_new_flags="$ac_new_flags$s$i";
else
ac_new_flags="$ac_new_flags$s$l $i";
@@ -108677,7 +108671,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -104806,41 +46697,18 @@
+@@ -104735,41 +46651,18 @@
return 0;
}
_ACEOF
@@ -108723,7 +108717,7 @@
fi
-@@ -104884,17 +46752,13 @@
+@@ -104813,17 +46706,13 @@
fi
@@ -108744,7 +108738,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -104905,56 +46769,29 @@
+@@ -104834,56 +46723,29 @@
return 0;
}
_ACEOF
@@ -108808,7 +108802,7 @@
/* end confdefs.h. */
#include <signal.h>
int
-@@ -104965,41 +46802,18 @@
+@@ -104894,41 +46756,18 @@
return 0;
}
_ACEOF
@@ -108854,7 +108848,7 @@
fi
-@@ -105023,151 +46837,12 @@
+@@ -104952,151 +46791,12 @@
fi
@@ -109011,7 +109005,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -105481,151 +47156,12 @@
+@@ -105410,151 +47110,12 @@
@@ -109167,7 +109161,7 @@
_ACEOF
fi
-@@ -105635,23 +47171,17 @@
+@@ -105564,23 +47125,17 @@
@@ -109194,7 +109188,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -105669,54 +47199,28 @@
+@@ -105598,54 +47153,28 @@
return 0;
}
_ACEOF
@@ -109256,7 +109250,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -105732,18 +47236,13 @@
+@@ -105661,18 +47190,13 @@
fi
@@ -109278,7 +109272,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -105761,40 +47260,19 @@
+@@ -105690,40 +47214,19 @@
return 0;
}
_ACEOF
@@ -109321,7 +109315,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -105816,7 +47294,7 @@
+@@ -105745,7 +47248,7 @@
# Check whether --enable-dmalloc was given.
@@ -109330,7 +109324,7 @@
enableval=$enable_dmalloc;
fi
-@@ -105824,14 +47302,10 @@
+@@ -105753,14 +47256,10 @@
if test "x$enable_dmalloc" = xyes
then
@@ -109347,7 +109341,7 @@
LIBS="$LIBS -ldmalloc"
fi
-@@ -105929,87 +47403,54 @@
+@@ -105858,87 +47357,54 @@
#################################################
# Display summary of libraries detected
@@ -109451,7 +109445,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
-@@ -106068,13 +47509,13 @@
+@@ -105997,13 +47463,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -109467,7 +109461,7 @@
esac ;;
esac
done
-@@ -106082,8 +47523,8 @@
+@@ -106011,8 +47477,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -109478,7 +109472,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -106106,11 +47547,11 @@
+@@ -106035,11 +47501,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" &&
@@ -109492,7 +109486,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -106130,8 +47571,8 @@
+@@ -106059,8 +47525,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.
@@ -109503,7 +109497,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -106155,9 +47596,10 @@
+@@ -106084,9 +47550,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -109516,7 +109510,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -106167,17 +47609,18 @@
+@@ -106096,17 +47563,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -109542,7 +109536,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -106185,23 +47628,15 @@
+@@ -106114,23 +47582,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -109571,7 +109565,7 @@
as_nl='
'
export as_nl
-@@ -106209,7 +47644,13 @@
+@@ -106138,7 +47598,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
@@ -109586,7 +109580,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -106220,7 +47661,7 @@
+@@ -106149,7 +47615,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -109595,7 +109589,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -106243,13 +47684,6 @@
+@@ -106172,13 +47638,6 @@
}
fi
@@ -109609,7 +109603,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -106259,15 +47693,15 @@
+@@ -106188,15 +47647,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -109628,7 +109622,7 @@
IFS=$as_save_IFS
;;
-@@ -106279,12 +47713,16 @@
+@@ -106208,12 +47667,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -109649,7 +109643,7 @@
done
PS1='$ '
PS2='> '
-@@ -106296,7 +47734,89 @@
+@@ -106225,7 +47688,89 @@
LANGUAGE=C
export LANGUAGE
@@ -109740,7 +109734,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -106310,8 +47830,12 @@
+@@ -106239,8 +47784,12 @@
as_basename=false
fi
@@ -109754,7 +109748,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -106331,76 +47855,25 @@
+@@ -106260,76 +47809,25 @@
}
s/.*/./; q'`
@@ -109842,7 +109836,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -106429,8 +47902,56 @@
+@@ -106358,8 +47856,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -109900,7 +109894,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -106449,10 +47970,10 @@
+@@ -106378,10 +47924,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -109913,7 +109907,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -106467,13 +47988,19 @@
+@@ -106396,13 +47942,19 @@
exec 6>&1
@@ -109935,7 +109929,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -106505,13 +48032,15 @@
+@@ -106434,13 +47986,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -109954,7 +109948,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -106530,16 +48059,17 @@
+@@ -106459,16 +48013,17 @@
Configuration commands:
$config_commands
@@ -109976,7 +109970,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -106574,6 +48104,8 @@
+@@ -106503,6 +48058,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -109985,7 +109979,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -106581,20 +48113,19 @@
+@@ -106510,20 +48067,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -110010,7 +110004,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -106602,11 +48133,10 @@
+@@ -106531,11 +48087,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -110025,7 +110019,7 @@
ac_need_defaults=false ;;
esac
-@@ -106699,9 +48229,7 @@
+@@ -106628,9 +48183,7 @@
"pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
"../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
@@ -110036,7 +110030,7 @@
esac
done
-@@ -106728,7 +48256,7 @@
+@@ -106657,7 +48210,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -110045,7 +110039,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -106739,11 +48267,7 @@
+@@ -106668,11 +48221,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -110058,7 +110052,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -106751,10 +48275,16 @@
+@@ -106680,10 +48229,16 @@
if test -n "$CONFIG_FILES"; then
@@ -110078,7 +110072,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -106768,24 +48298,18 @@
+@@ -106697,24 +48252,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -110106,7 +110100,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -106807,7 +48331,7 @@
+@@ -106736,7 +48285,7 @@
t delim
:nl
h
@@ -110115,7 +110109,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -106821,7 +48345,7 @@
+@@ -106750,7 +48299,7 @@
t nl
:delim
h
@@ -110124,7 +110118,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -106874,9 +48398,7 @@
+@@ -106803,9 +48352,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -110135,7 +110129,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -106917,9 +48439,7 @@
+@@ -106846,9 +48393,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -110146,7 +110140,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -107004,9 +48524,7 @@
+@@ -106933,9 +48478,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -110157,7 +110151,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -107019,9 +48537,7 @@
+@@ -106948,9 +48491,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -110168,7 +110162,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -107049,12 +48565,10 @@
+@@ -106978,12 +48519,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -110183,7 +110177,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -107065,7 +48579,7 @@
+@@ -106994,7 +48533,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -110192,7 +110186,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -107078,9 +48592,7 @@
+@@ -107007,9 +48546,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -110203,7 +110197,7 @@
esac
;;
esac
-@@ -107108,47 +48620,7 @@
+@@ -107037,47 +48574,7 @@
q
}
s/.*/./; q'`
@@ -110252,7 +110246,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -107200,7 +48672,6 @@
+@@ -107129,7 +48626,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=
@@ -110260,7 +110254,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -107210,12 +48681,11 @@
+@@ -107139,12 +48635,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -110275,7 +110269,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
-@@ -107225,7 +48695,7 @@
+@@ -107154,7 +48649,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -110284,7 +110278,7 @@
esac
_ACEOF
-@@ -107253,14 +48723,12 @@
+@@ -107182,14 +48677,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -110301,7 +110295,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;}
-@@ -107270,9 +48738,7 @@
+@@ -107199,9 +48692,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -110312,7 +110306,7 @@
;;
:H)
#
-@@ -107283,29 +48749,23 @@
+@@ -107212,29 +48703,23 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -110347,7 +110341,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -107331,15 +48791,12 @@
+@@ -107260,15 +48745,12 @@
done # for ac_tag
@@ -110365,7 +110359,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -107360,10 +48817,10 @@
+@@ -107289,10 +48771,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.
@@ -110378,7 +110372,7 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -107374,8 +48831,8 @@
+@@ -107303,8 +48785,8 @@
# Print very concise instructions on building/use
if test "x$enable_dmalloc" = xyes
then
Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch 2010-04-07 20:24:28 UTC (rev 3421)
+++ branches/samba/experimental/debian/patches/documentation.patch 2010-04-08 17:47:30 UTC (rev 3422)
@@ -2,11 +2,11 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: samba/docs/manpages/swat.8
+Index: experimental/docs/manpages/swat.8
===================================================================
---- samba.orig/docs/manpages/swat.8
-+++ samba/docs/manpages/swat.8
-@@ -111,85 +111,6 @@
+--- experimental.orig/docs/manpages/swat.8
++++ experimental/docs/manpages/swat.8
+@@ -261,85 +261,6 @@
.RS 4
Print a summary of command line options\&.
.RE
@@ -15,9 +15,9 @@
-Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
-.PP
-After you compile SWAT you need to run
--make install
+-\FCmake install \F[]
-to install the
--swat
+-\FCswat\F[]
-binary and the various help files and images\&. A default install would put these in:
-.sp
-.RS 4
@@ -56,210 +56,210 @@
-.SS "Inetd Installation"
-.PP
-You need to edit your
--/etc/inetd\&.conf
+-\FC/etc/inetd\&.conf \F[]
-and
--/etc/services
+-\FC/etc/services\F[]
-to enable SWAT to be launched via
--inetd\&.
+-\FCinetd\F[]\&.
-.PP
-In
--/etc/services
+-\FC/etc/services\F[]
-you need to add a line like this:
-.PP
--swat 901/tcp
+-\FCswat 901/tcp\F[]
-.PP
-Note for NIS/YP and LDAP users \- you may need to rebuild the NIS service maps rather than alter your local
--/etc/services
+-\FC /etc/services\F[]
-file\&.
-.PP
-the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
--inetd
+-\FCinetd\F[]
-daemon)\&.
-.PP
-In
--/etc/inetd\&.conf
+-\FC/etc/inetd\&.conf\F[]
-you should add a line like this:
-.PP
--swat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat
+-\FCswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\F[]
-.PP
-Once you have edited
--/etc/services
+-\FC/etc/services\F[]
-and
--/etc/inetd\&.conf
+-\FC/etc/inetd\&.conf\F[]
-you need to send a HUP signal to inetd\&. To do this use
--kill \-1 PID
+-\FCkill \-1 PID \F[]
-where PID is the process ID of the inetd daemon\&.
.SH "LAUNCHING"
.PP
To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&.
-@@ -207,14 +128,11 @@
+@@ -357,14 +278,11 @@
This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
.RE
.PP
--/usr/local/samba/lib/smb\&.conf
-+/etc/samba/smb\&.conf
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
.RS 4
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file that swat edits\&. Other common places that systems install this file are
--/usr/samba/lib/smb\&.conf
+-\FC /usr/samba/lib/smb\&.conf\F[]
-and
--/etc/smb\&.conf\&. This file describes all the services the server is to make available to clients\&.
+-\FC/etc/smb\&.conf \F[]\&. This file describes all the services the server is to make available to clients\&.
+server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
.RE
.SH "WARNINGS"
.PP
-Index: samba/docs/manpages/nmbd.8
+Index: experimental/docs/manpages/nmbd.8
===================================================================
---- samba.orig/docs/manpages/nmbd.8
-+++ samba/docs/manpages/nmbd.8
-@@ -115,10 +115,7 @@
+--- experimental.orig/docs/manpages/nmbd.8
++++ experimental/docs/manpages/nmbd.8
+@@ -265,10 +265,7 @@
to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
\fIONLY\fR\&.
.sp
-The default path to this file is compiled into Samba as part of the build process\&. Common defaults are
--/usr/local/samba/lib/lmhosts,
--/usr/samba/lib/lmhosts
+-\FC/usr/local/samba/lib/lmhosts\F[],
+-\FC/usr/samba/lib/lmhosts\F[]
-or
+The default path to this file is
- /etc/samba/lmhosts\&. See the
+ \FC/etc/samba/lmhosts\F[]\&. See the
\fBlmhosts\fR(5)
man page for details on the contents of this file\&.
-@@ -187,14 +184,11 @@
- inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+@@ -337,14 +334,11 @@
+ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
.PP
--/usr/local/samba/lib/smb\&.conf
-+/etc/samba/smb\&.conf
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
.RS 4
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file\&. Other common places that systems install this file are
--/usr/samba/lib/smb\&.conf
+-\FC/usr/samba/lib/smb\&.conf\F[]
-and
--/etc/samba/smb\&.conf\&.
-+server configuration file\&.
+-\FC/etc/samba/smb\&.conf\F[]\&.
+++server configuration file\&.
.sp
When run as a WINS server (see the
\m[blue]\fBwins support\fR\m[]
-@@ -238,10 +232,8 @@
+@@ -388,10 +382,8 @@
will accept SIGHUP, which will cause it to dump out its namelists into the file
- namelist\&.debug
+ \FCnamelist\&.debug \F[]
in the
--/usr/local/samba/var/locks
+-\FC/usr/local/samba/var/locks\F[]
-directory (or the
--var/locks
+-\FCvar/locks\F[]
-directory configured under wherever Samba was configured to install itself)\&. This will also cause
-+/var/run/samba
++\FC/var/run/samba\F[]
+directory\&. This will also cause
- nmbd
+ \FCnmbd\F[]
to dump out its server database in the
- log\&.nmb
-Index: samba/docs/manpages/smbd.8
+ \FClog\&.nmb\F[]
+Index: experimental/docs/manpages/smbd.8
===================================================================
---- samba.orig/docs/manpages/smbd.8
-+++ samba/docs/manpages/smbd.8
-@@ -169,14 +169,11 @@
- inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+--- experimental.orig/docs/manpages/smbd.8
++++ experimental/docs/manpages/smbd.8
+@@ -319,14 +319,11 @@
+ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
.PP
--/usr/local/samba/lib/smb\&.conf
-+/etc/samba/smb\&.conf
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
.RS 4
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file\&. Other common places that systems install this file are
--/usr/samba/lib/smb\&.conf
+-\FC/usr/samba/lib/smb\&.conf\F[]
-and
--/etc/samba/smb\&.conf\&.
-+server configuration file\&.
+-\FC/etc/samba/smb\&.conf\F[]\&.
+++server configuration file\&.
.sp
This file describes all the services the server is to make available to clients\&. See
\fBsmb.conf\fR(5)
-Index: samba/docs/manpages/lmhosts.5
+Index: experimental/docs/manpages/lmhosts.5
===================================================================
---- samba.orig/docs/manpages/lmhosts.5
-+++ samba/docs/manpages/lmhosts.5
-@@ -95,10 +95,8 @@
+--- experimental.orig/docs/manpages/lmhosts.5
++++ experimental/docs/manpages/lmhosts.5
+@@ -257,10 +257,8 @@
file\&.
.SH "FILES"
.PP
-lmhosts is loaded from the configuration directory\&. This is usually
--/etc/samba
+-\FC/etc/samba\F[]
-or
--/usr/local/samba/lib\&.
+-\FC/usr/local/samba/lib\F[]\&.
+lmhosts is loaded from the configuration directory\&. This is
-+/etc/samba\&.
++\FC/etc/samba\F[]\&.
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: samba/docs/manpages/ntlm_auth.1
+Index: experimental/docs/manpages/ntlm_auth.1
===================================================================
---- samba.orig/docs/manpages/ntlm_auth.1
-+++ samba/docs/manpages/ntlm_auth.1
-@@ -43,7 +43,7 @@
+--- experimental.orig/docs/manpages/ntlm_auth.1
++++ experimental/docs/manpages/ntlm_auth.1
+@@ -193,7 +193,7 @@
Some of these commands also require access to the directory
- winbindd_privileged
+ \FCwinbindd_privileged\F[]
in
--$LOCKDIR\&. This should be done either by running this command as root or providing group access to the
-+/var/run/samba\&. This should be done either by running this command as root or providing group access to the
- winbindd_privileged
+-\FC$LOCKDIR\F[]\&. This should be done either by running this command as root or providing group access to the
++\FC/var/run/samba\F[]\&. This should be done either by running this command as root or providing group access to the
+ \FCwinbindd_privileged\F[]
directory\&. For security reasons, this directory should not be world\-accessable\&.
.SH "OPTIONS"
-@@ -69,7 +69,7 @@
+@@ -219,7 +219,7 @@
Requires access to the directory
- winbindd_privileged
+ \FCwinbindd_privileged\F[]
in
--$LOCKDIR\&. The protocol used is described here:
-+/var/run/samba\&. The protocol used is described here:
+-\FC$LOCKDIR\F[]\&. The protocol used is described here:
++\FC/var/run/samba\F[]\&. The protocol used is described here:
http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
- YR
+ \FCYR\F[]
command\&. (Thus avoiding loss of information in the protocol exchange)\&.
-@@ -92,7 +92,7 @@
+@@ -242,7 +242,7 @@
Requires access to the directory
- winbindd_privileged
+ \FCwinbindd_privileged\F[]
in
--$LOCKDIR\&.
-+/var/run/samba\&.
+-\FC$LOCKDIR\F[]\&.
++\FC/var/run/samba\F[]\&.
.RE
.PP
gss\-spnego\-client
-Index: samba/docs/manpages/tdbbackup.8
+Index: experimental/docs/manpages/tdbbackup.8
===================================================================
---- samba.orig/docs/manpages/tdbbackup.8
-+++ samba/docs/manpages/tdbbackup.8
-@@ -77,7 +77,7 @@
+--- experimental.orig/docs/manpages/tdbbackup.8
++++ experimental/docs/manpages/tdbbackup.8
+@@ -227,7 +227,7 @@
.\}
- secrets\&.tdb
+ \FCsecrets\&.tdb\F[]
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
.RE
.sp
.RS 4
-@@ -90,7 +90,7 @@
+@@ -240,7 +240,7 @@
.\}
- passdb\&.tdb
+ \FCpassdb\&.tdb\F[]
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
.RE
.sp
.RS 4
-@@ -103,7 +103,7 @@
+@@ -253,7 +253,7 @@
.\}
- *\&.tdb
+ \FC*\&.tdb\F[]
-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
+located in the /var/lib/samba and /var/run/samba directories\&.
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: samba/docs/manpages/winbindd.8
+Index: experimental/docs/manpages/winbindd.8
===================================================================
---- samba.orig/docs/manpages/winbindd.8
-+++ samba/docs/manpages/winbindd.8
-@@ -549,16 +549,16 @@
+--- experimental.orig/docs/manpages/winbindd.8
++++ experimental/docs/manpages/winbindd.8
+@@ -771,16 +771,16 @@
file are owned by root\&.
.RE
.PP
@@ -267,20 +267,20 @@
+/var/run/samba/winbindd_privileged/pipe
.RS 4
The UNIX pipe over which \'privileged\' clients communicate with the
- winbindd
+ \FCwinbindd\F[]
program\&. For security reasons, access to some winbindd functions \- like those needed by the
- ntlm_auth
+ \FCntlm_auth\F[]
-utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
--$LOCKDIR/winbindd_privileged
+-\FC$LOCKDIR/winbindd_privileged\F[]
+utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
-+/var/run/samba/winbindd_privileged
++\FC/var/run/samba/winbindd_privileged\F[]
directory and
--$LOCKDIR/winbindd_privileged/pipe
-+/var/run/samba/winbindd_privileged/pipe
+-\FC$LOCKDIR/winbindd_privileged/pipe\F[]
++\FC/var/run/samba/winbindd_privileged/pipe\F[]
file are owned by root\&.
.RE
.PP
-@@ -567,15 +567,12 @@
+@@ -789,15 +789,12 @@
Implementation of name service switch library\&.
.RE
.PP
@@ -290,7 +290,7 @@
-Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the
-\fI\-\-with\-lockdir\fR
-option\&. This directory is by default
--/usr/local/samba/var/locks\&.
+-\FC/usr/local/samba/var/locks \F[]\&.
+Storage for the Windows NT rid to UNIX user/group id mapping\&.
.RE
.PP
More information about the Pkg-samba-maint
mailing list