Bringing packaging/Debian/* to a more recent state.

(This used to be commit cd7494a19608f2b4a63b9c654dd8e0a0fc587c39)

14 files changed, 1033 insertions, 6325 deletions

diff --git a/packaging/Debian/debian/patches/Makefile.patch b/packaging/Debian/debian/patches/Makefile.patch
deleted file mode 100644
index 2b28da5c3a..0000000000
--- a/packaging/Debian/debian/patches/Makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- samba-2.2.2.cvs20020120.orig/source/Makefile.in
-+++ samba-2.2.2.cvs20020120/source/Makefile.in
-@@ -91,7 +91,7 @@
- 
- SPROGS = bin/smbd bin/nmbd bin/swat
- PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/make_printerdef @RUNPROG@ 
--PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT@
-+PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT_STATIC@ @LIBSMBCLIENT_SHARED@
- MPROGS = @MPROGS@
- LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
- PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup
-@@ -614,13 +614,15 @@
- 	@echo Linking shared library $@
- 	@$(SHLD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
- 
--libsmbclient: $(LIBSMBCLIENT_PICOBJS)
--	@echo Linking libsmbclient shared library bin/$@.@SHLIBEXT@
--	@$(SHLD) @LDSHFLAGS@ -o  bin/$@.@SHLIBEXT@ \
-+bin/libsmbclient.so: $(LIBSMBCLIENT_PICOBJS)
-+	@echo Linking libsmbclient shared library $@
-+	@$(SHLD) @LDSHFLAGS@ -o  $@ \
- 		$(LIBSMBCLIENT_PICOBJS) $(LIBS) \
- 		@SONAMEFLAG@libsmbclient.so.$(LIBSMBCLIENT_MAJOR)
--	@echo Linking libsmbclient non-shared library bin/$@.a
--	@-$(AR) -rc bin/$@.a $(LIBSMBCLIENT_PICOBJS)
-+
-+bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
-+	@echo Linking libsmbclient non-shared library $@
-+	@-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
- 
- bin/smbsh: $(SMBSH_OBJ) bin/.dummy
- 	@echo Linking $@
-@@ -673,10 +675,12 @@
- installswat: installdirs
- 	@$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
- 
--installclientlib:
--	-$(INSTALLCMD) bin/libsmbclient.so
--	-$(INSTALLCMD) -d ${prefix}/include
--	-$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
-+installclientlib: bin/libsmbclient.so bin/libsmbclient.a
-+	# Installed (in the wrong location, BTW) by installbin above (peloy@debian.org)
-+	# -$(INSTALLCMD) bin/libsmbclient.so $(BASEDIR)/lib
-+	# -$(INSTALLCMD) bin/libsmbclient.a $(BASEDIR)/lib
-+	-$(INSTALLCMD) -d $(INCLUDEDIR)
-+	-$(INSTALLCMD) include/libsmbclient.h $(INCLUDEDIR)
- 
- # revert to the previously installed version
- revert:
diff --git a/packaging/Debian/debian/patches/configure.patch b/packaging/Debian/debian/patches/configure.patch
index 497455120d..0cf1434b29 100644
--- a/packaging/Debian/debian/patches/configure.patch
+++ b/packaging/Debian/debian/patches/configure.patch
@@ -1,5997 +1,7 @@
---- samba-2.2.2.cvs20020120.orig/source/configure
-+++ samba-2.2.2.cvs20020120/source/configure
-@@ -1077,7 +1077,7 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--for ac_prog in gawk mawk nawk awk
-+for ac_prog in mawk gawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -1537,6 +1537,47 @@
- rm -fr conftest*
- fi
- 
-+	if test x$LINUX_LFS_SUPPORT = xyes ; then
-+          if test "$cross_compiling" = yes; then
-+  LINUX_LFS_SUPPORT=cross
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1546 "configure"
-+#include "confdefs.h"
-+
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+main() {
-+   unsigned int *padding;
-+   struct flock foo_lock = {F_WRLCK, SEEK_SET, 0, 1, 0};
-+   int fd = open("/dev/null", O_RDWR);
-+
-+   /* Yes, we're depending on the internals of the Linux flock structure
-+      here -- but this test is explicitly Linux-specific to begin with. */
-+   padding = (unsigned int *)&foo_lock;
-+   padding[1] = 0xffffffff;
-+   foo_lock.l_start = 0;
-+   if (fcntl(fd, F_SETLK, &foo_lock) < 0)
-+      exit(1);
-+
-+   exit(0);
-+}
-+
-+EOF
-+if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  LINUX_LFS_SUPPORT=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  LINUX_LFS_SUPPORT=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+	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"
-@@ -1546,14 +1587,14 @@
- 
-     *hurd*)
-         echo $ac_n "checking for LFS support""... $ac_c" 1>&6
--echo "configure:1550: checking for LFS support" >&5
-+echo "configure:1591: checking for LFS support" >&5
-         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 <<EOF
--#line 1557 "configure"
-+#line 1598 "configure"
- #include "confdefs.h"
- 
- #include <unistd.h>
-@@ -1565,7 +1606,7 @@
- #endif
- }
- EOF
--if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   GLIBC_LFS_SUPPORT=yes
- else
-@@ -1587,21 +1628,21 @@
- esac
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:1591: checking for inline" >&5
-+echo "configure:1632: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 1598 "configure"
-+#line 1639 "configure"
- #include "confdefs.h"
- 
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -1627,7 +1668,7 @@
- esac
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1631: checking how to run the C preprocessor" >&5
-+echo "configure:1672: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -1642,13 +1683,13 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 1646 "configure"
-+#line 1687 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1659,13 +1700,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 1663 "configure"
-+#line 1704 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1676,13 +1717,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 1680 "configure"
-+#line 1721 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1707,12 +1748,12 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1711: checking for ANSI C header files" >&5
-+echo "configure:1752: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1716 "configure"
-+#line 1757 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1720,7 +1761,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1737,7 +1778,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1741 "configure"
-+#line 1782 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1755,7 +1796,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1759 "configure"
-+#line 1800 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1776,7 +1817,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1780 "configure"
-+#line 1821 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1787,7 +1828,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -1815,12 +1856,12 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:1819: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:1860: checking for $ac_hdr that defines DIR" >&5
- if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1824 "configure"
-+#line 1865 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -1828,7 +1869,7 @@
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:1832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-@@ -1853,7 +1894,7 @@
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
- echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
--echo "configure:1857: checking for opendir in -ldir" >&5
-+echo "configure:1898: checking for opendir in -ldir" >&5
- ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1861,7 +1902,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldir  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1865 "configure"
-+#line 1906 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1872,7 +1913,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1894,7 +1935,7 @@
- 
- else
- echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:1898: checking for opendir in -lx" >&5
-+echo "configure:1939: checking for opendir in -lx" >&5
- ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1902,7 +1943,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lx  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1906 "configure"
-+#line 1947 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1913,7 +1954,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1936,12 +1977,12 @@
- fi
- 
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:1940: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:1981: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1945 "configure"
-+#line 1986 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -1950,7 +1991,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:1954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_time=yes
- else
-@@ -1971,12 +2012,12 @@
- fi
- 
- echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:1975: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo "configure:2016: checking for sys/wait.h that is POSIX.1 compatible" >&5
- if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1980 "configure"
-+#line 2021 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -1992,7 +2033,7 @@
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ; return 0; }
- EOF
--if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_sys_wait_h=yes
- else
-@@ -2016,17 +2057,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2020: checking for $ac_hdr" >&5
-+echo "configure:2061: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2025 "configure"
-+#line 2066 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2056,17 +2097,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2060: checking for $ac_hdr" >&5
-+echo "configure:2101: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2065 "configure"
-+#line 2106 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2096,17 +2137,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2100: checking for $ac_hdr" >&5
-+echo "configure:2141: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2105 "configure"
-+#line 2146 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2136,17 +2177,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2140: checking for $ac_hdr" >&5
-+echo "configure:2181: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2145 "configure"
-+#line 2186 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2176,17 +2217,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2180: checking for $ac_hdr" >&5
-+echo "configure:2221: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2185 "configure"
-+#line 2226 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2216,17 +2257,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2220: checking for $ac_hdr" >&5
-+echo "configure:2261: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2225 "configure"
-+#line 2266 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2256,17 +2297,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2260: checking for $ac_hdr" >&5
-+echo "configure:2301: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2265 "configure"
-+#line 2306 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2296,17 +2337,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2300: checking for $ac_hdr" >&5
-+echo "configure:2341: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2305 "configure"
-+#line 2346 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2340,14 +2381,14 @@
- case "$host_os" in
-     *hpux*)
- 		cat > conftest.$ac_ext <<EOF
--#line 2344 "configure"
-+#line 2385 "configure"
- #include "confdefs.h"
- #include <shadow.h>
- int main() {
- struct spwd testme
- ; return 0; }
- EOF
--if { (eval echo configure:2351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_shadow_h=yes
- else
-@@ -2369,17 +2410,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2373: checking for $ac_hdr" >&5
-+echo "configure:2414: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2378 "configure"
-+#line 2419 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2409,17 +2450,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2413: checking for $ac_hdr" >&5
-+echo "configure:2454: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2418 "configure"
-+#line 2459 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2449,17 +2490,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2453: checking for $ac_hdr" >&5
-+echo "configure:2494: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2458 "configure"
-+#line 2499 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2489,17 +2530,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2493: checking for $ac_hdr" >&5
-+echo "configure:2534: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2498 "configure"
-+#line 2539 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2529,17 +2570,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2533: checking for $ac_hdr" >&5
-+echo "configure:2574: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2538 "configure"
-+#line 2579 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2571,17 +2612,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2575: checking for $ac_hdr" >&5
-+echo "configure:2616: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2580 "configure"
-+#line 2621 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2613,17 +2654,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2617: checking for $ac_hdr" >&5
-+echo "configure:2658: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2622 "configure"
-+#line 2663 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2655,17 +2696,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2659: checking for $ac_hdr" >&5
-+echo "configure:2700: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2664 "configure"
-+#line 2705 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2693,7 +2734,7 @@
- 
- 
- echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:2697: checking size of int" >&5
-+echo "configure:2738: checking size of int" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2701,18 +2742,19 @@
-   ac_cv_sizeof_int=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2705 "configure"
-+#line 2746 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+#include <sys/types.h>
-+main()
- {
-   FILE *f=fopen("conftestval", "w");
--  if (!f) return(1);
-+  if (!f) exit(1);
-   fprintf(f, "%d\n", sizeof(int));
--  return(0);
-+  exit(0);
- }
- EOF
--if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_sizeof_int=`cat conftestval`
- else
-@@ -2732,7 +2774,7 @@
- 
- 
- echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:2736: checking size of long" >&5
-+echo "configure:2778: checking size of long" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2740,18 +2782,19 @@
-   ac_cv_sizeof_long=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2744 "configure"
-+#line 2786 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+#include <sys/types.h>
-+main()
- {
-   FILE *f=fopen("conftestval", "w");
--  if (!f) return(1);
-+  if (!f) exit(1);
-   fprintf(f, "%d\n", sizeof(long));
--  return(0);
-+  exit(0);
- }
- EOF
--if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_sizeof_long=`cat conftestval`
- else
-@@ -2771,7 +2814,7 @@
- 
- 
- echo $ac_n "checking size of short""... $ac_c" 1>&6
--echo "configure:2775: checking size of short" >&5
-+echo "configure:2818: checking size of short" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2779,18 +2822,19 @@
-   ac_cv_sizeof_short=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2783 "configure"
-+#line 2826 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+#include <sys/types.h>
-+main()
- {
-   FILE *f=fopen("conftestval", "w");
--  if (!f) return(1);
-+  if (!f) exit(1);
-   fprintf(f, "%d\n", sizeof(short));
--  return(0);
-+  exit(0);
- }
- EOF
--if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_sizeof_short=`cat conftestval`
- else
-@@ -2811,12 +2855,12 @@
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:2815: checking for working const" >&5
-+echo "configure:2859: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2820 "configure"
-+#line 2864 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -2865,7 +2909,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -2886,21 +2930,21 @@
- fi
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:2890: checking for inline" >&5
-+echo "configure:2934: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 2897 "configure"
-+#line 2941 "configure"
- #include "confdefs.h"
- 
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -2926,14 +2970,14 @@
- esac
- 
- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:2930: checking whether byte ordering is bigendian" >&5
-+echo "configure:2974: checking whether byte ordering is bigendian" >&5
- if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_bigendian=unknown
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat > conftest.$ac_ext <<EOF
--#line 2937 "configure"
-+#line 2981 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -2944,11 +2988,11 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   # It does; now see whether it defined to BIG_ENDIAN or not.
- cat > conftest.$ac_ext <<EOF
--#line 2952 "configure"
-+#line 2996 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -2959,7 +3003,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:2963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_bigendian=yes
- else
-@@ -2979,7 +3023,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2983 "configure"
-+#line 3027 "configure"
- #include "confdefs.h"
- main () {
-   /* Are we little or big endian?  From Harbison&Steele.  */
-@@ -2992,7 +3036,7 @@
-   exit (u.c[sizeof (long) - 1] == 1);
- }
- EOF
--if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_bigendian=no
- else
-@@ -3016,14 +3060,14 @@
- fi
- 
- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
--echo "configure:3020: checking whether char is unsigned" >&5
-+echo "configure:3064: checking whether char is unsigned" >&5
- if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$GCC" = yes; then
-   # GCC predefines this symbol on systems where it applies.
- cat > conftest.$ac_ext <<EOF
--#line 3027 "configure"
-+#line 3071 "configure"
- #include "confdefs.h"
- #ifdef __CHAR_UNSIGNED__
-   yes
-@@ -3045,7 +3089,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3049 "configure"
-+#line 3093 "configure"
- #include "confdefs.h"
- /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
- #if !defined(__STDC__) || __STDC__ != 1
-@@ -3055,7 +3099,7 @@
-   volatile char c = 255; exit(c < 0);
- }
- EOF
--if { (eval echo configure:3059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_char_unsigned=yes
- else
-@@ -3080,12 +3124,12 @@
- 
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:3084: checking return type of signal handlers" >&5
-+echo "configure:3128: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3089 "configure"
-+#line 3133 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -3102,7 +3146,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -3121,12 +3165,12 @@
- 
- 
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:3125: checking for uid_t in sys/types.h" >&5
-+echo "configure:3169: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3130 "configure"
-+#line 3174 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -3155,12 +3199,12 @@
- fi
- 
- echo $ac_n "checking for mode_t""... $ac_c" 1>&6
--echo "configure:3159: checking for mode_t" >&5
-+echo "configure:3203: checking for mode_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3164 "configure"
-+#line 3208 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3188,12 +3232,12 @@
- fi
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:3192: checking for off_t" >&5
-+echo "configure:3236: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3197 "configure"
-+#line 3241 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3221,12 +3265,12 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:3225: checking for size_t" >&5
-+echo "configure:3269: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3230 "configure"
-+#line 3274 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3254,12 +3298,12 @@
- fi
- 
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:3258: checking for pid_t" >&5
-+echo "configure:3302: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3263 "configure"
-+#line 3307 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3287,12 +3331,12 @@
- fi
- 
- echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
--echo "configure:3291: checking for st_rdev in struct stat" >&5
-+echo "configure:3335: checking for st_rdev in struct stat" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3296 "configure"
-+#line 3340 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -3300,7 +3344,7 @@
- struct stat s; s.st_rdev;
- ; return 0; }
- EOF
--if { (eval echo configure:3304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_struct_st_rdev=yes
- else
-@@ -3321,12 +3365,12 @@
- fi
- 
- echo $ac_n "checking for d_off in dirent""... $ac_c" 1>&6
--echo "configure:3325: checking for d_off in dirent" >&5
-+echo "configure:3369: checking for d_off in dirent" >&5
- if eval "test \"`echo '$''{'ac_cv_dirent_d_off'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3330 "configure"
-+#line 3374 "configure"
- #include "confdefs.h"
- 
- #include <unistd.h>
-@@ -3336,7 +3380,7 @@
- struct dirent d; d.d_off;
- ; return 0; }
- EOF
--if { (eval echo configure:3340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_dirent_d_off=yes
- else
-@@ -3357,12 +3401,12 @@
- fi
- 
- echo $ac_n "checking for ino_t""... $ac_c" 1>&6
--echo "configure:3361: checking for ino_t" >&5
-+echo "configure:3405: checking for ino_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3366 "configure"
-+#line 3410 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3390,12 +3434,12 @@
- fi
- 
- echo $ac_n "checking for loff_t""... $ac_c" 1>&6
--echo "configure:3394: checking for loff_t" >&5
-+echo "configure:3438: checking for loff_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3399 "configure"
-+#line 3443 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3423,12 +3467,12 @@
- fi
- 
- echo $ac_n "checking for offset_t""... $ac_c" 1>&6
--echo "configure:3427: checking for offset_t" >&5
-+echo "configure:3471: checking for offset_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_offset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3432 "configure"
-+#line 3476 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3456,12 +3500,12 @@
- fi
- 
- echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
--echo "configure:3460: checking for ssize_t" >&5
-+echo "configure:3504: checking for ssize_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3465 "configure"
-+#line 3509 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3489,12 +3533,12 @@
- fi
- 
- echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
--echo "configure:3493: checking for wchar_t" >&5
-+echo "configure:3537: checking for wchar_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_wchar_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3498 "configure"
-+#line 3542 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3526,7 +3570,7 @@
- # for cups support we need libcups, and a handful of header files
- 
- echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6
--echo "configure:3530: checking for httpConnect in -lcups" >&5
-+echo "configure:3574: checking for httpConnect in -lcups" >&5
- ac_lib_var=`echo cups'_'httpConnect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3534,7 +3578,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcups  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3538 "configure"
-+#line 3582 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3545,7 +3589,7 @@
- httpConnect()
- ; return 0; }
- EOF
--if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3580,17 +3624,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3584: checking for $ac_hdr" >&5
-+echo "configure:3628: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3589 "configure"
-+#line 3633 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3629,7 +3673,7 @@
- ############################################
- # we need libdl for PAM and the new VFS code
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:3633: checking for dlopen in -ldl" >&5
-+echo "configure:3677: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3637,7 +3681,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3641 "configure"
-+#line 3685 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3648,7 +3692,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3676,13 +3720,13 @@
- ############################################
- # check if the compiler can do immediate structures
- echo $ac_n "checking for immediate structures""... $ac_c" 1>&6
--echo "configure:3680: checking for immediate structures" >&5
-+echo "configure:3724: checking for immediate structures" >&5
- if eval "test \"`echo '$''{'samba_cv_immediate_structures'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3686 "configure"
-+#line 3730 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -3694,7 +3738,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_immediate_structures=yes
- else
-@@ -3717,13 +3761,13 @@
- ############################################
- # check for unix domain sockets
- echo $ac_n "checking for unix domain sockets""... $ac_c" 1>&6
--echo "configure:3721: checking for unix domain sockets" >&5
-+echo "configure:3765: checking for unix domain sockets" >&5
- if eval "test \"`echo '$''{'samba_cv_unixsocket'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3727 "configure"
-+#line 3771 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -3738,7 +3782,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_unixsocket=yes
- else
-@@ -3759,13 +3803,13 @@
- fi
- 
- echo $ac_n "checking for socklen_t type""... $ac_c" 1>&6
--echo "configure:3763: checking for socklen_t type" >&5
-+echo "configure:3807: checking for socklen_t type" >&5
- if eval "test \"`echo '$''{'samba_cv_socklen_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3769 "configure"
-+#line 3813 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -3778,7 +3822,7 @@
- socklen_t i = 0
- ; return 0; }
- EOF
--if { (eval echo configure:3782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_socklen_t=yes
- else
-@@ -3799,13 +3843,13 @@
- fi
- 
- echo $ac_n "checking for sig_atomic_t type""... $ac_c" 1>&6
--echo "configure:3803: checking for sig_atomic_t type" >&5
-+echo "configure:3847: checking for sig_atomic_t type" >&5
- if eval "test \"`echo '$''{'samba_cv_sig_atomic_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3809 "configure"
-+#line 3853 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -3818,7 +3862,7 @@
- sig_atomic_t i = 0
- ; return 0; }
- EOF
--if { (eval echo configure:3822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_sig_atomic_t=yes
- else
-@@ -3841,20 +3885,20 @@
- # stupid headers have the functions but no declaration. grrrr.
- 
-  echo $ac_n "checking for errno declaration""... $ac_c" 1>&6
--echo "configure:3845: checking for errno declaration" >&5
-+echo "configure:3889: checking for errno declaration" >&5
- if eval "test \"`echo '$''{'ac_cv_have_errno_decl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3851 "configure"
-+#line 3895 "configure"
- #include "confdefs.h"
- #include <errno.h>
- int main() {
- int i = (int)errno
- ; return 0; }
- EOF
--if { (eval echo configure:3858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_errno_decl=yes
- else
-@@ -3876,20 +3920,20 @@
- 
- 
-  echo $ac_n "checking for setresuid declaration""... $ac_c" 1>&6
--echo "configure:3880: checking for setresuid declaration" >&5
-+echo "configure:3924: checking for setresuid declaration" >&5
- if eval "test \"`echo '$''{'ac_cv_have_setresuid_decl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3886 "configure"
-+#line 3930 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- int main() {
- int i = (int)setresuid
- ; return 0; }
- EOF
--if { (eval echo configure:3893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_setresuid_decl=yes
- else
-@@ -3911,20 +3955,20 @@
- 
- 
-  echo $ac_n "checking for setresgid declaration""... $ac_c" 1>&6
--echo "configure:3915: checking for setresgid declaration" >&5
-+echo "configure:3959: checking for setresgid declaration" >&5
- if eval "test \"`echo '$''{'ac_cv_have_setresgid_decl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3921 "configure"
-+#line 3965 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- int main() {
- int i = (int)setresgid
- ; return 0; }
- EOF
--if { (eval echo configure:3928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_setresgid_decl=yes
- else
-@@ -3946,20 +3990,20 @@
- 
- 
-  echo $ac_n "checking for asprintf declaration""... $ac_c" 1>&6
--echo "configure:3950: checking for asprintf declaration" >&5
-+echo "configure:3994: checking for asprintf declaration" >&5
- if eval "test \"`echo '$''{'ac_cv_have_asprintf_decl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3956 "configure"
-+#line 4000 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- int i = (int)asprintf
- ; return 0; }
- EOF
--if { (eval echo configure:3963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_asprintf_decl=yes
- else
-@@ -3981,20 +4025,20 @@
- 
- 
-  echo $ac_n "checking for vasprintf declaration""... $ac_c" 1>&6
--echo "configure:3985: checking for vasprintf declaration" >&5
-+echo "configure:4029: checking for vasprintf declaration" >&5
- if eval "test \"`echo '$''{'ac_cv_have_vasprintf_decl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 3991 "configure"
-+#line 4035 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- int i = (int)vasprintf
- ; return 0; }
- EOF
--if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_vasprintf_decl=yes
- else
-@@ -4016,20 +4060,20 @@
- 
- 
-  echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6
--echo "configure:4020: checking for vsnprintf declaration" >&5
-+echo "configure:4064: checking for vsnprintf declaration" >&5
- if eval "test \"`echo '$''{'ac_cv_have_vsnprintf_decl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 4026 "configure"
-+#line 4070 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- int i = (int)vsnprintf
- ; return 0; }
- EOF
--if { (eval echo configure:4033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_vsnprintf_decl=yes
- else
-@@ -4051,20 +4095,20 @@
- 
- 
-  echo $ac_n "checking for snprintf declaration""... $ac_c" 1>&6
--echo "configure:4055: checking for snprintf declaration" >&5
-+echo "configure:4099: checking for snprintf declaration" >&5
- if eval "test \"`echo '$''{'ac_cv_have_snprintf_decl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 4061 "configure"
-+#line 4105 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- int i = (int)snprintf
- ; return 0; }
- EOF
--if { (eval echo configure:4068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_snprintf_decl=yes
- else
-@@ -4088,7 +4132,7 @@
- # and glibc has setresuid under linux but the function does
- # nothing until kernel 2.1.44! very dumb.
- echo $ac_n "checking for real setresuid""... $ac_c" 1>&6
--echo "configure:4092: checking for real setresuid" >&5
-+echo "configure:4136: checking for real setresuid" >&5
- if eval "test \"`echo '$''{'samba_cv_have_setresuid'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4097,12 +4141,12 @@
-   samba_cv_have_setresuid=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4101 "configure"
-+#line 4145 "configure"
- #include "confdefs.h"
- #include <errno.h>
- main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
- EOF
--if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_have_setresuid=yes
- else
-@@ -4127,7 +4171,7 @@
- # Do the same check for setresguid...
- #
- echo $ac_n "checking for real setresgid""... $ac_c" 1>&6
--echo "configure:4131: checking for real setresgid" >&5
-+echo "configure:4175: checking for real setresgid" >&5
- if eval "test \"`echo '$''{'samba_cv_have_setresgid'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4136,13 +4180,13 @@
-   samba_cv_have_setresgid=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4140 "configure"
-+#line 4184 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- #include <errno.h>
- main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
- EOF
--if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_have_setresgid=yes
- else
-@@ -4165,7 +4209,7 @@
- fi
- 
- echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:4169: checking for 8-bit clean memcmp" >&5
-+echo "configure:4213: checking for 8-bit clean memcmp" >&5
- if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4173,7 +4217,7 @@
-   ac_cv_func_memcmp_clean=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4177 "configure"
-+#line 4221 "configure"
- #include "confdefs.h"
- 
- main()
-@@ -4183,7 +4227,7 @@
- }
- 
- EOF
--if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_memcmp_clean=yes
- else
-@@ -4207,7 +4251,7 @@
- 
- # test for where we get readline() from
- echo $ac_n "checking whether to use readline""... $ac_c" 1>&6
--echo "configure:4211: checking whether to use readline" >&5
-+echo "configure:4255: checking whether to use readline" >&5
- # Check whether --with-readline or --without-readline was given.
- if test "${with_readline+set}" = set; then
-   withval="$with_readline"
-@@ -4219,17 +4263,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4223: checking for $ac_hdr" >&5
-+echo "configure:4267: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4228 "configure"
-+#line 4272 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4259,17 +4303,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4263: checking for $ac_hdr" >&5
-+echo "configure:4307: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4268 "configure"
-+#line 4312 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4300,17 +4344,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4304: checking for $ac_hdr" >&5
-+echo "configure:4348: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4309 "configure"
-+#line 4353 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4333,7 +4377,7 @@
-  
-       for termlib in ncurses curses termcap terminfo termlib; do
-        echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6
--echo "configure:4337: checking for tgetent in -l${termlib}" >&5
-+echo "configure:4381: checking for tgetent in -l${termlib}" >&5
- ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4341,7 +4385,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-l${termlib}  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4345 "configure"
-+#line 4389 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4352,7 +4396,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4374,7 +4418,7 @@
- 
-       done
-       echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6
--echo "configure:4378: checking for rl_callback_handler_install in -lreadline" >&5
-+echo "configure:4422: checking for rl_callback_handler_install in -lreadline" >&5
- ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4382,7 +4426,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lreadline $TERMLIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4386 "configure"
-+#line 4430 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4393,7 +4437,7 @@
- rl_callback_handler_install()
- ; return 0; }
- EOF
--if { (eval echo configure:4397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4444,17 +4488,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4448: checking for $ac_hdr" >&5
-+echo "configure:4492: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4453 "configure"
-+#line 4497 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4484,17 +4528,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4488: checking for $ac_hdr" >&5
-+echo "configure:4532: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4493 "configure"
-+#line 4537 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4525,17 +4569,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4529: checking for $ac_hdr" >&5
-+echo "configure:4573: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4534 "configure"
-+#line 4578 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4558,7 +4602,7 @@
-  
-       for termlib in ncurses curses termcap terminfo termlib; do
-        echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6
--echo "configure:4562: checking for tgetent in -l${termlib}" >&5
-+echo "configure:4606: checking for tgetent in -l${termlib}" >&5
- ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4566,7 +4610,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-l${termlib}  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4570 "configure"
-+#line 4614 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4577,7 +4621,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4599,7 +4643,7 @@
- 
-       done
-       echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6
--echo "configure:4603: checking for rl_callback_handler_install in -lreadline" >&5
-+echo "configure:4647: checking for rl_callback_handler_install in -lreadline" >&5
- ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4607,7 +4651,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lreadline $TERMLIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4611 "configure"
-+#line 4655 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4618,7 +4662,7 @@
- rl_callback_handler_install()
- ; return 0; }
- EOF
--if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4673,12 +4717,12 @@
- for ac_func in connect
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4677: checking for $ac_func" >&5
-+echo "configure:4721: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4682 "configure"
-+#line 4726 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -4701,7 +4745,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4729,7 +4773,7 @@
-     case "$LIBS" in
-     *-lnsl*) ;;
-     *) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6
--echo "configure:4733: checking for printf in -lnsl_s" >&5
-+echo "configure:4777: checking for printf in -lnsl_s" >&5
- ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4737,7 +4781,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl_s  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4741 "configure"
-+#line 4785 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4748,7 +4792,7 @@
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4779,7 +4823,7 @@
-     case "$LIBS" in
-     *-lnsl*) ;;
-     *) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6
--echo "configure:4783: checking for printf in -lnsl" >&5
-+echo "configure:4827: checking for printf in -lnsl" >&5
- ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4787,7 +4831,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4791 "configure"
-+#line 4835 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4798,7 +4842,7 @@
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4829,7 +4873,7 @@
-     case "$LIBS" in
-     *-lsocket*) ;;
-     *) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:4833: checking for connect in -lsocket" >&5
-+echo "configure:4877: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4837,7 +4881,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4841 "configure"
-+#line 4885 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4848,7 +4892,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4879,7 +4923,7 @@
-     case "$LIBS" in
-     *-linet*) ;;
-     *) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6
--echo "configure:4883: checking for connect in -linet" >&5
-+echo "configure:4927: checking for connect in -linet" >&5
- ac_lib_var=`echo inet'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4887,7 +4931,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-linet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4891 "configure"
-+#line 4935 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4898,7 +4942,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:4902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4942,12 +4986,12 @@
- for ac_func in yp_get_default_domain
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4946: checking for $ac_func" >&5
-+echo "configure:4990: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4951 "configure"
-+#line 4995 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -4970,7 +5014,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4996,7 +5040,7 @@
- 
- if test x"$ac_cv_func_yp_get_default_domain" = x"no"; then
- 	echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
--echo "configure:5000: checking for yp_get_default_domain in -lnsl" >&5
-+echo "configure:5044: checking for yp_get_default_domain in -lnsl" >&5
- ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5004,7 +5048,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5008 "configure"
-+#line 5052 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5015,7 +5059,7 @@
- yp_get_default_domain()
- ; return 0; }
- EOF
--if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5045,12 +5089,12 @@
- for ac_func in execl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5049: checking for $ac_func" >&5
-+echo "configure:5093: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5054 "configure"
-+#line 5098 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5073,7 +5117,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5106,12 +5150,12 @@
- for ac_func in waitpid getcwd strdup strtoul strerror chown fchown chmod fchmod chroot link
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5110: checking for $ac_func" >&5
-+echo "configure:5154: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5115 "configure"
-+#line 5159 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5134,7 +5178,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5161,12 +5205,12 @@
- for ac_func in fstat strchr utime utimes getrlimit fsync bzero memset setpgid mknod mknod64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5165: checking for $ac_func" >&5
-+echo "configure:5209: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5170 "configure"
-+#line 5214 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5189,7 +5233,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5216,12 +5260,12 @@
- for ac_func in memmove vsnprintf snprintf asprintf vasprintf setsid glob strpbrk pipe crypt16 getauthuid
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5220: checking for $ac_func" >&5
-+echo "configure:5264: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5225 "configure"
-+#line 5269 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5244,7 +5288,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5271,12 +5315,12 @@
- for ac_func in strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5275: checking for $ac_func" >&5
-+echo "configure:5319: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5280 "configure"
-+#line 5324 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5299,7 +5343,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5326,12 +5370,12 @@
- for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf realpath
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5330: checking for $ac_func" >&5
-+echo "configure:5374: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5335 "configure"
-+#line 5379 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5354,7 +5398,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5381,12 +5425,12 @@
- for ac_func in setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate stat64 fstat64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5385: checking for $ac_func" >&5
-+echo "configure:5429: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5390 "configure"
-+#line 5434 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5409,7 +5453,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5436,12 +5480,12 @@
- for ac_func in lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64 readdir64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5440: checking for $ac_func" >&5
-+echo "configure:5484: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5445 "configure"
-+#line 5489 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5464,7 +5508,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5491,12 +5535,12 @@
- for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5495: checking for $ac_func" >&5
-+echo "configure:5539: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5500 "configure"
-+#line 5544 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5519,7 +5563,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5546,12 +5590,12 @@
- for ac_func in srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5550: checking for $ac_func" >&5
-+echo "configure:5594: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5555 "configure"
-+#line 5599 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5574,7 +5618,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5601,12 +5645,12 @@
- for ac_func in syslog vsyslog
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5605: checking for $ac_func" >&5
-+echo "configure:5649: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5610 "configure"
-+#line 5654 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5629,7 +5673,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5658,12 +5702,12 @@
- for ac_func in syscall
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5662: checking for $ac_func" >&5
-+echo "configure:5706: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5667 "configure"
-+#line 5711 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5686,7 +5730,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5714,12 +5758,12 @@
- for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5718: checking for $ac_func" >&5
-+echo "configure:5762: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5723 "configure"
-+#line 5767 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5742,7 +5786,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5769,12 +5813,12 @@
- for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5773: checking for $ac_func" >&5
-+echo "configure:5817: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5778 "configure"
-+#line 5822 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5797,7 +5841,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5824,12 +5868,12 @@
- for ac_func in __getcwd _getcwd
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5828: checking for $ac_func" >&5
-+echo "configure:5872: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5833 "configure"
-+#line 5877 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5852,7 +5896,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5879,12 +5923,12 @@
- for ac_func in __xstat __fxstat __lxstat
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5883: checking for $ac_func" >&5
-+echo "configure:5927: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5888 "configure"
-+#line 5932 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5907,7 +5951,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5934,12 +5978,12 @@
- for ac_func in _stat _lstat _fstat __stat __lstat __fstat
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5938: checking for $ac_func" >&5
-+echo "configure:5982: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5943 "configure"
-+#line 5987 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5962,7 +6006,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5989,12 +6033,12 @@
- for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5993: checking for $ac_func" >&5
-+echo "configure:6037: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5998 "configure"
-+#line 6042 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6017,7 +6061,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6044,12 +6088,12 @@
- for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6048: checking for $ac_func" >&5
-+echo "configure:6092: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6053 "configure"
-+#line 6097 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6072,7 +6116,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6099,12 +6143,12 @@
- for ac_func in getdents _getdents __getdents _lseek __lseek _read __read
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6103: checking for $ac_func" >&5
-+echo "configure:6147: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6108 "configure"
-+#line 6152 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6127,7 +6171,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6154,12 +6198,12 @@
- for ac_func in _write __write _fork __fork
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6158: checking for $ac_func" >&5
-+echo "configure:6202: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6163 "configure"
-+#line 6207 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6182,7 +6226,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6209,12 +6253,12 @@
- for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6213: checking for $ac_func" >&5
-+echo "configure:6257: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6218 "configure"
-+#line 6262 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6237,7 +6281,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6264,12 +6308,12 @@
- for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6268: checking for $ac_func" >&5
-+echo "configure:6312: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6273 "configure"
-+#line 6317 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6292,7 +6336,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6319,12 +6363,12 @@
- for ac_func in pread _pread __pread pread64 _pread64 __pread64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6323: checking for $ac_func" >&5
-+echo "configure:6367: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6328 "configure"
-+#line 6372 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6347,7 +6391,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6374,12 +6418,12 @@
- for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6378: checking for $ac_func" >&5
-+echo "configure:6422: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6383 "configure"
-+#line 6427 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6402,7 +6446,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6429,12 +6473,12 @@
- for ac_func in open64 _open64 __open64 creat64
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6433: checking for $ac_func" >&5
-+echo "configure:6477: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6438 "configure"
-+#line 6482 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6457,7 +6501,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6488,9 +6532,9 @@
- 
- if test x$ac_cv_func_stat64 = xno ; then
-   echo $ac_n "checking for stat64 in <sys/stat.h>""... $ac_c" 1>&6
--echo "configure:6492: checking for stat64 in <sys/stat.h>" >&5
-+echo "configure:6536: checking for stat64 in <sys/stat.h>" >&5
-   cat > conftest.$ac_ext <<EOF
--#line 6494 "configure"
-+#line 6538 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -6502,7 +6546,7 @@
- struct stat64 st64; exit(stat64(".",&st64));
- ; return 0; }
- EOF
--if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_stat64=yes
- else
-@@ -6521,9 +6565,9 @@
- 
- if test x$ac_cv_func_lstat64 = xno ; then
-   echo $ac_n "checking for lstat64 in <sys/stat.h>""... $ac_c" 1>&6
--echo "configure:6525: checking for lstat64 in <sys/stat.h>" >&5
-+echo "configure:6569: checking for lstat64 in <sys/stat.h>" >&5
-   cat > conftest.$ac_ext <<EOF
--#line 6527 "configure"
-+#line 6571 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -6535,7 +6579,7 @@
- struct stat64 st64; exit(lstat64(".",&st64));
- ; return 0; }
- EOF
--if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_lstat64=yes
- else
-@@ -6554,9 +6598,9 @@
- 
- if test x$ac_cv_func_fstat64 = xno ; then
-   echo $ac_n "checking for fstat64 in <sys/stat.h>""... $ac_c" 1>&6
--echo "configure:6558: checking for fstat64 in <sys/stat.h>" >&5
-+echo "configure:6602: checking for fstat64 in <sys/stat.h>" >&5
-   cat > conftest.$ac_ext <<EOF
--#line 6560 "configure"
-+#line 6604 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -6568,7 +6612,7 @@
- struct stat64 st64; exit(fstat64(0,&st64));
- ; return 0; }
- EOF
--if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_fstat64=yes
- else
-@@ -6593,7 +6637,7 @@
- 
- if test x$ac_cv_func_strcasecmp = xno ; then
- 	echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
--echo "configure:6597: checking for strcasecmp in -lresolv" >&5
-+echo "configure:6641: checking for strcasecmp in -lresolv" >&5
- ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6601,7 +6645,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lresolv  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6605 "configure"
-+#line 6649 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6612,7 +6656,7 @@
- strcasecmp()
- ; return 0; }
- EOF
--if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6648,12 +6692,12 @@
-   *-lsecurity*) for ac_func in putprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6652: checking for $ac_func" >&5
-+echo "configure:6696: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6657 "configure"
-+#line 6701 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6676,7 +6720,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6701,7 +6745,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for putprpwnam in -lsecurity""... $ac_c" 1>&6
--echo "configure:6705: checking for putprpwnam in -lsecurity" >&5
-+echo "configure:6749: checking for putprpwnam in -lsecurity" >&5
- ac_lib_var=`echo security'_'putprpwnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6709,7 +6753,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsecurity  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6713 "configure"
-+#line 6757 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6720,7 +6764,7 @@
- putprpwnam()
- ; return 0; }
- EOF
--if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6750,12 +6794,12 @@
-      for ac_func in putprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6754: checking for $ac_func" >&5
-+echo "configure:6798: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6759 "configure"
-+#line 6803 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6778,7 +6822,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6809,12 +6853,12 @@
-   *-lsec*) for ac_func in putprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6813: checking for $ac_func" >&5
-+echo "configure:6857: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6818 "configure"
-+#line 6862 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6837,7 +6881,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6862,7 +6906,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for putprpwnam in -lsec""... $ac_c" 1>&6
--echo "configure:6866: checking for putprpwnam in -lsec" >&5
-+echo "configure:6910: checking for putprpwnam in -lsec" >&5
- ac_lib_var=`echo sec'_'putprpwnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6870,7 +6914,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsec  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6874 "configure"
-+#line 6918 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6881,7 +6925,7 @@
- putprpwnam()
- ; return 0; }
- EOF
--if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6911,12 +6955,12 @@
-      for ac_func in putprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6915: checking for $ac_func" >&5
-+echo "configure:6959: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6920 "configure"
-+#line 6964 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6939,7 +6983,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6971,12 +7015,12 @@
-   *-lsecurity*) for ac_func in set_auth_parameters
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6975: checking for $ac_func" >&5
-+echo "configure:7019: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6980 "configure"
-+#line 7024 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6999,7 +7043,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7024,7 +7068,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
--echo "configure:7028: checking for set_auth_parameters in -lsecurity" >&5
-+echo "configure:7072: checking for set_auth_parameters in -lsecurity" >&5
- ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7032,7 +7076,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsecurity  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7036 "configure"
-+#line 7080 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7043,7 +7087,7 @@
- set_auth_parameters()
- ; return 0; }
- EOF
--if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7073,12 +7117,12 @@
-      for ac_func in set_auth_parameters
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7077: checking for $ac_func" >&5
-+echo "configure:7121: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7082 "configure"
-+#line 7126 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7101,7 +7145,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7132,12 +7176,12 @@
-   *-lsec*) for ac_func in set_auth_parameters
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7136: checking for $ac_func" >&5
-+echo "configure:7180: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7141 "configure"
-+#line 7185 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7160,7 +7204,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7185,7 +7229,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for set_auth_parameters in -lsec""... $ac_c" 1>&6
--echo "configure:7189: checking for set_auth_parameters in -lsec" >&5
-+echo "configure:7233: checking for set_auth_parameters in -lsec" >&5
- ac_lib_var=`echo sec'_'set_auth_parameters | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7193,7 +7237,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsec  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7197 "configure"
-+#line 7241 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7204,7 +7248,7 @@
- set_auth_parameters()
- ; return 0; }
- EOF
--if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7234,12 +7278,12 @@
-      for ac_func in set_auth_parameters
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7238: checking for $ac_func" >&5
-+echo "configure:7282: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7243 "configure"
-+#line 7287 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7262,7 +7306,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7295,12 +7339,12 @@
-   *-lgen*) for ac_func in getspnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7299: checking for $ac_func" >&5
-+echo "configure:7343: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7304 "configure"
-+#line 7348 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7323,7 +7367,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7348,7 +7392,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for getspnam in -lgen""... $ac_c" 1>&6
--echo "configure:7352: checking for getspnam in -lgen" >&5
-+echo "configure:7396: checking for getspnam in -lgen" >&5
- ac_lib_var=`echo gen'_'getspnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7356,7 +7400,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgen  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7360 "configure"
-+#line 7404 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7367,7 +7411,7 @@
- getspnam()
- ; return 0; }
- EOF
--if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7397,12 +7441,12 @@
-      for ac_func in getspnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7401: checking for $ac_func" >&5
-+echo "configure:7445: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7406 "configure"
-+#line 7450 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7425,7 +7469,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7457,12 +7501,12 @@
-   *-lsecurity*) for ac_func in getspnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7461: checking for $ac_func" >&5
-+echo "configure:7505: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7466 "configure"
-+#line 7510 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7485,7 +7529,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7510,7 +7554,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for getspnam in -lsecurity""... $ac_c" 1>&6
--echo "configure:7514: checking for getspnam in -lsecurity" >&5
-+echo "configure:7558: checking for getspnam in -lsecurity" >&5
- ac_lib_var=`echo security'_'getspnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7518,7 +7562,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsecurity  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7522 "configure"
-+#line 7566 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7529,7 +7573,7 @@
- getspnam()
- ; return 0; }
- EOF
--if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7559,12 +7603,12 @@
-      for ac_func in getspnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7563: checking for $ac_func" >&5
-+echo "configure:7607: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7568 "configure"
-+#line 7612 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7587,7 +7631,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7618,12 +7662,12 @@
-   *-lsec*) for ac_func in getspnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7622: checking for $ac_func" >&5
-+echo "configure:7666: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7627 "configure"
-+#line 7671 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7646,7 +7690,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7671,7 +7715,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6
--echo "configure:7675: checking for getspnam in -lsec" >&5
-+echo "configure:7719: checking for getspnam in -lsec" >&5
- ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7679,7 +7723,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsec  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7683 "configure"
-+#line 7727 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7690,7 +7734,7 @@
- getspnam()
- ; return 0; }
- EOF
--if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7720,12 +7764,12 @@
-      for ac_func in getspnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7724: checking for $ac_func" >&5
-+echo "configure:7768: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7729 "configure"
-+#line 7773 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7748,7 +7792,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7780,12 +7824,12 @@
-   *-lsecurity*) for ac_func in bigcrypt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7784: checking for $ac_func" >&5
-+echo "configure:7828: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7789 "configure"
-+#line 7833 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7808,7 +7852,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7833,7 +7877,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for bigcrypt in -lsecurity""... $ac_c" 1>&6
--echo "configure:7837: checking for bigcrypt in -lsecurity" >&5
-+echo "configure:7881: checking for bigcrypt in -lsecurity" >&5
- ac_lib_var=`echo security'_'bigcrypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7841,7 +7885,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsecurity  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7845 "configure"
-+#line 7889 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7852,7 +7896,7 @@
- bigcrypt()
- ; return 0; }
- EOF
--if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7882,12 +7926,12 @@
-      for ac_func in bigcrypt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7886: checking for $ac_func" >&5
-+echo "configure:7930: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7891 "configure"
-+#line 7935 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7910,7 +7954,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7941,12 +7985,12 @@
-   *-lsec*) for ac_func in bigcrypt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:7945: checking for $ac_func" >&5
-+echo "configure:7989: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7950 "configure"
-+#line 7994 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -7969,7 +8013,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:7973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -7994,7 +8038,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for bigcrypt in -lsec""... $ac_c" 1>&6
--echo "configure:7998: checking for bigcrypt in -lsec" >&5
-+echo "configure:8042: checking for bigcrypt in -lsec" >&5
- ac_lib_var=`echo sec'_'bigcrypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8002,7 +8046,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsec  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8006 "configure"
-+#line 8050 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -8013,7 +8057,7 @@
- bigcrypt()
- ; return 0; }
- EOF
--if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -8043,12 +8087,12 @@
-      for ac_func in bigcrypt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:8047: checking for $ac_func" >&5
-+echo "configure:8091: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8052 "configure"
-+#line 8096 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -8071,7 +8115,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:8075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -8103,12 +8147,12 @@
-   *-lsecurity*) for ac_func in getprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:8107: checking for $ac_func" >&5
-+echo "configure:8151: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8112 "configure"
-+#line 8156 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -8131,7 +8175,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:8135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -8156,7 +8200,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6
--echo "configure:8160: checking for getprpwnam in -lsecurity" >&5
-+echo "configure:8204: checking for getprpwnam in -lsecurity" >&5
- ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8164,7 +8208,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsecurity  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8168 "configure"
-+#line 8212 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -8175,7 +8219,7 @@
- getprpwnam()
- ; return 0; }
- EOF
--if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -8205,12 +8249,12 @@
-      for ac_func in getprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:8209: checking for $ac_func" >&5
-+echo "configure:8253: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8214 "configure"
-+#line 8258 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -8233,7 +8277,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:8237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -8264,12 +8308,12 @@
-   *-lsec*) for ac_func in getprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:8268: checking for $ac_func" >&5
-+echo "configure:8312: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8273 "configure"
-+#line 8317 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -8292,7 +8336,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -8317,7 +8361,7 @@
- done
-  ;;
-   *) echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6
--echo "configure:8321: checking for getprpwnam in -lsec" >&5
-+echo "configure:8365: checking for getprpwnam in -lsec" >&5
- ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8325,7 +8369,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsec  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8329 "configure"
-+#line 8373 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -8336,7 +8380,7 @@
- getprpwnam()
- ; return 0; }
- EOF
--if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -8366,12 +8410,12 @@
-      for ac_func in getprpwnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:8370: checking for $ac_func" >&5
-+echo "configure:8414: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8375 "configure"
-+#line 8419 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -8394,7 +8438,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -8437,7 +8481,7 @@
- # Assume non-shared by default and override below
- BLDSHARED="false" 
- echo $ac_n "checking ability to build shared libraries""... $ac_c" 1>&6
--echo "configure:8441: checking ability to build shared libraries" >&5
-+echo "configure:8485: checking ability to build shared libraries" >&5
- 
- # and these are for particular systems
- case "$host_os" in
-@@ -8572,7 +8616,7 @@
- 		*dgux*) # Extract the first word of "groff", so it can be a program name with args.
- set dummy groff; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:8576: checking for $ac_word" >&5
-+echo "configure:8620: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_ROFF'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8626,15 +8670,15 @@
- esac
- echo "$ac_t""$BLDSHARED" 1>&6
- echo $ac_n "checking linker flags for shared libraries""... $ac_c" 1>&6
--echo "configure:8630: checking linker flags for shared libraries" >&5
-+echo "configure:8674: checking linker flags for shared libraries" >&5
- echo "$ac_t""$LDSHFLAGS" 1>&6
- echo $ac_n "checking compiler flags for position-independent code""... $ac_c" 1>&6
--echo "configure:8633: checking compiler flags for position-independent code" >&5
-+echo "configure:8677: checking compiler flags for position-independent code" >&5
- echo "$ac_t""$PICFLAGS" 1>&6
- 
- # try to work out how to produce pic code with this compiler
- echo $ac_n "checking whether ${CC-cc} accepts -fpic""... $ac_c" 1>&6
--echo "configure:8638: checking whether ${CC-cc} accepts -fpic" >&5
-+echo "configure:8682: checking whether ${CC-cc} accepts -fpic" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_fpic'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8654,7 +8698,7 @@
- fi
- if test x$PICFLAG = x; then
-   echo $ac_n "checking whether ${CC-cc} accepts -KPIC""... $ac_c" 1>&6
--echo "configure:8658: checking whether ${CC-cc} accepts -KPIC" >&5
-+echo "configure:8702: checking whether ${CC-cc} accepts -KPIC" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_KPIC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8675,7 +8719,7 @@
- fi
- if test x$PICFLAG = x; then
-   echo $ac_n "checking whether ${CC-cc} accepts -Kpic""... $ac_c" 1>&6
--echo "configure:8679: checking whether ${CC-cc} accepts -Kpic" >&5
-+echo "configure:8723: checking whether ${CC-cc} accepts -Kpic" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_Kpic'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8698,7 +8742,7 @@
- ################
- 
- echo $ac_n "checking for long long""... $ac_c" 1>&6
--echo "configure:8702: checking for long long" >&5
-+echo "configure:8746: checking for long long" >&5
- if eval "test \"`echo '$''{'samba_cv_have_longlong'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8707,12 +8751,12 @@
-   samba_cv_have_longlong=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8711 "configure"
-+#line 8755 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); }
- EOF
--if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_have_longlong=yes
- else
-@@ -8739,20 +8783,20 @@
- # AIX needs this.
- 
- echo $ac_n "checking for LL suffix on long long integers""... $ac_c" 1>&6
--echo "configure:8743: checking for LL suffix on long long integers" >&5
-+echo "configure:8787: checking for LL suffix on long long integers" >&5
- if eval "test \"`echo '$''{'samba_cv_compiler_supports_ll'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-     cat > conftest.$ac_ext <<EOF
--#line 8749 "configure"
-+#line 8793 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- long long i = 0x8000000000LL
- ; return 0; }
- EOF
--if { (eval echo configure:8756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_compiler_supports_ll=yes
- else
-@@ -8774,7 +8818,7 @@
- 
-   
- echo $ac_n "checking for 64 bit off_t""... $ac_c" 1>&6
--echo "configure:8778: checking for 64 bit off_t" >&5
-+echo "configure:8822: checking for 64 bit off_t" >&5
- if eval "test \"`echo '$''{'samba_cv_SIZEOF_OFF_T'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8783,13 +8827,13 @@
-   samba_cv_SIZEOF_OFF_T=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8787 "configure"
-+#line 8831 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <sys/stat.h>
- main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
- EOF
--if { (eval echo configure:8793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_SIZEOF_OFF_T=yes
- else
-@@ -8812,7 +8856,7 @@
- fi
- 
- echo $ac_n "checking for off64_t""... $ac_c" 1>&6
--echo "configure:8816: checking for off64_t" >&5
-+echo "configure:8860: checking for off64_t" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_OFF64_T'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8821,7 +8865,7 @@
-   samba_cv_HAVE_OFF64_T=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8825 "configure"
-+#line 8869 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -8831,7 +8875,7 @@
- #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); }
- EOF
--if { (eval echo configure:8835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_OFF64_T=yes
- else
-@@ -8854,7 +8898,7 @@
- fi
- 
- echo $ac_n "checking for 64 bit ino_t""... $ac_c" 1>&6
--echo "configure:8858: checking for 64 bit ino_t" >&5
-+echo "configure:8902: checking for 64 bit ino_t" >&5
- if eval "test \"`echo '$''{'samba_cv_SIZEOF_INO_T'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8863,13 +8907,13 @@
-   samba_cv_SIZEOF_INO_T=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8867 "configure"
-+#line 8911 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <sys/stat.h>
- main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
- EOF
--if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_SIZEOF_INO_T=yes
- else
-@@ -8892,7 +8936,7 @@
- fi
- 
- echo $ac_n "checking for ino64_t""... $ac_c" 1>&6
--echo "configure:8896: checking for ino64_t" >&5
-+echo "configure:8940: checking for ino64_t" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_INO64_T'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8901,7 +8945,7 @@
-   samba_cv_HAVE_INO64_T=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8905 "configure"
-+#line 8949 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -8911,7 +8955,7 @@
- #include <sys/stat.h>
- main() { struct stat64 st; ino64_t s; if (sizeof(ino_t) == sizeof(ino64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
- EOF
--if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_INO64_T=yes
- else
-@@ -8934,7 +8978,7 @@
- fi
- 
- echo $ac_n "checking for dev64_t""... $ac_c" 1>&6
--echo "configure:8938: checking for dev64_t" >&5
-+echo "configure:8982: checking for dev64_t" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_DEV64_T'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8943,7 +8987,7 @@
-   samba_cv_HAVE_DEV64_T=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8947 "configure"
-+#line 8991 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -8953,7 +8997,7 @@
- #include <sys/stat.h>
- main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
- EOF
--if { (eval echo configure:8957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_DEV64_T=yes
- else
-@@ -8976,13 +9020,13 @@
- fi
- 
- echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6
--echo "configure:8980: checking for struct dirent64" >&5
-+echo "configure:9024: checking for struct dirent64" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_DIRENT64'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 8986 "configure"
-+#line 9030 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -8994,7 +9038,7 @@
- struct dirent64 de;
- ; return 0; }
- EOF
--if { (eval echo configure:8998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_STRUCT_DIRENT64=yes
- else
-@@ -9015,7 +9059,7 @@
- fi
- 
- echo $ac_n "checking for major macro""... $ac_c" 1>&6
--echo "configure:9019: checking for major macro" >&5
-+echo "configure:9063: checking for major macro" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_DEVICE_MAJOR_FN'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9024,7 +9068,7 @@
-   samba_cv_HAVE_DEVICE_MAJOR_FN=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9028 "configure"
-+#line 9072 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -9033,7 +9077,7 @@
- #include <sys/types.h>
- main() { dev_t dev; int i = major(dev); return 0; }
- EOF
--if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_DEVICE_MAJOR_FN=yes
- else
-@@ -9056,7 +9100,7 @@
- fi
- 
- echo $ac_n "checking for minor macro""... $ac_c" 1>&6
--echo "configure:9060: checking for minor macro" >&5
-+echo "configure:9104: checking for minor macro" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_DEVICE_MINOR_FN'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9065,7 +9109,7 @@
-   samba_cv_HAVE_DEVICE_MINOR_FN=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9069 "configure"
-+#line 9113 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -9074,7 +9118,7 @@
- #include <sys/types.h>
- main() { dev_t dev; int i = minor(dev); return 0; }
- EOF
--if { (eval echo configure:9078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_DEVICE_MINOR_FN=yes
- else
-@@ -9097,7 +9141,7 @@
- fi
- 
- echo $ac_n "checking for makedev macro""... $ac_c" 1>&6
--echo "configure:9101: checking for makedev macro" >&5
-+echo "configure:9145: checking for makedev macro" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_MAKEDEV_FN'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9106,7 +9150,7 @@
-   samba_cv_HAVE_MAKEDEV_FN=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9110 "configure"
-+#line 9154 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -9115,7 +9159,7 @@
- #include <sys/types.h>
- main() { dev_t dev = makedev(1,2); return 0; }
- EOF
--if { (eval echo configure:9119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_MAKEDEV_FN=yes
- else
-@@ -9138,7 +9182,7 @@
- fi
- 
- echo $ac_n "checking for unsigned char""... $ac_c" 1>&6
--echo "configure:9142: checking for unsigned char" >&5
-+echo "configure:9186: checking for unsigned char" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UNSIGNED_CHAR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9147,12 +9191,12 @@
-   samba_cv_HAVE_UNSIGNED_CHAR=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9151 "configure"
-+#line 9195 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- main() { char c; c=250; exit((c > 0)?0:1); }
- EOF
--if { (eval echo configure:9156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_UNSIGNED_CHAR=yes
- else
-@@ -9175,13 +9219,13 @@
- fi
- 
- echo $ac_n "checking for sin_len in sock""... $ac_c" 1>&6
--echo "configure:9179: checking for sin_len in sock" >&5
-+echo "configure:9223: checking for sin_len in sock" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_SOCK_SIN_LEN'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9185 "configure"
-+#line 9229 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -9190,7 +9234,7 @@
- struct sockaddr_in sock; sock.sin_len = sizeof(sock);
- ; return 0; }
- EOF
--if { (eval echo configure:9194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_SOCK_SIN_LEN=yes
- else
-@@ -9211,13 +9255,13 @@
- fi
- 
- echo $ac_n "checking whether seekdir returns void""... $ac_c" 1>&6
--echo "configure:9215: checking whether seekdir returns void" >&5
-+echo "configure:9259: checking whether seekdir returns void" >&5
- if eval "test \"`echo '$''{'samba_cv_SEEKDIR_RETURNS_VOID'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9221 "configure"
-+#line 9265 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <dirent.h>
-@@ -9226,7 +9270,7 @@
- return 0;
- ; return 0; }
- EOF
--if { (eval echo configure:9230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_SEEKDIR_RETURNS_VOID=yes
- else
-@@ -9247,20 +9291,20 @@
- fi
- 
- echo $ac_n "checking for __FILE__ macro""... $ac_c" 1>&6
--echo "configure:9251: checking for __FILE__ macro" >&5
-+echo "configure:9295: checking for __FILE__ macro" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_FILE_MACRO'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9257 "configure"
-+#line 9301 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("%s\n", __FILE__);
- ; return 0; }
- EOF
--if { (eval echo configure:9264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_FILE_MACRO=yes
- else
-@@ -9281,20 +9325,20 @@
- fi
- 
- echo $ac_n "checking for __FUNCTION__ macro""... $ac_c" 1>&6
--echo "configure:9285: checking for __FUNCTION__ macro" >&5
-+echo "configure:9329: checking for __FUNCTION__ macro" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_FUNCTION_MACRO'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9291 "configure"
-+#line 9335 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("%s\n", __FUNCTION__);
- ; return 0; }
- EOF
--if { (eval echo configure:9298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_FUNCTION_MACRO=yes
- else
-@@ -9315,7 +9359,7 @@
- fi
- 
- echo $ac_n "checking if gettimeofday takes tz argument""... $ac_c" 1>&6
--echo "configure:9319: checking if gettimeofday takes tz argument" >&5
-+echo "configure:9363: checking if gettimeofday takes tz argument" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_GETTIMEOFDAY_TZ'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9324,14 +9368,14 @@
-   samba_cv_HAVE_GETTIMEOFDAY_TZ=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9328 "configure"
-+#line 9372 "configure"
- #include "confdefs.h"
- 
- #include <sys/time.h>
- #include <unistd.h>
- main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}
- EOF
--if { (eval echo configure:9335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
- else
-@@ -9354,7 +9398,7 @@
- fi
- 
- echo $ac_n "checking for C99 vsnprintf""... $ac_c" 1>&6
--echo "configure:9358: checking for C99 vsnprintf" >&5
-+echo "configure:9402: checking for C99 vsnprintf" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_C99_VSNPRINTF'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9363,7 +9407,7 @@
-   samba_cv_HAVE_C99_VSNPRINTF=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9367 "configure"
-+#line 9411 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9385,7 +9429,7 @@
- main() { foo("hello"); }
- 
- EOF
--if { (eval echo configure:9389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_C99_VSNPRINTF=yes
- else
-@@ -9408,7 +9452,7 @@
- fi
- 
- echo $ac_n "checking for broken readdir""... $ac_c" 1>&6
--echo "configure:9412: checking for broken readdir" >&5
-+echo "configure:9456: checking for broken readdir" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_READDIR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9417,7 +9461,7 @@
-   samba_cv_HAVE_BROKEN_READDIR=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9421 "configure"
-+#line 9465 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <dirent.h>
-@@ -9425,7 +9469,7 @@
- if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
- di->d_name[0] == 0) exit(0); exit(1);} 
- EOF
--if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_BROKEN_READDIR=yes
- else
-@@ -9448,13 +9492,13 @@
- fi
- 
- echo $ac_n "checking for utimbuf""... $ac_c" 1>&6
--echo "configure:9452: checking for utimbuf" >&5
-+echo "configure:9496: checking for utimbuf" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UTIMBUF'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9458 "configure"
-+#line 9502 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utime.h>
-@@ -9462,7 +9506,7 @@
- struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
- ; return 0; }
- EOF
--if { (eval echo configure:9466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UTIMBUF=yes
- else
-@@ -9486,12 +9530,12 @@
- for ac_func in pututline pututxline updwtmp updwtmpx getutmpx
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:9490: checking for $ac_func" >&5
-+echo "configure:9534: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9495 "configure"
-+#line 9539 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -9514,7 +9558,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:9518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -9540,13 +9584,13 @@
- 
- 
- echo $ac_n "checking for ut_name in utmp""... $ac_c" 1>&6
--echo "configure:9544: checking for ut_name in utmp" >&5
-+echo "configure:9588: checking for ut_name in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_NAME'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9550 "configure"
-+#line 9594 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9554,7 +9598,7 @@
- struct utmp ut;  ut.ut_name[0] = 'a';
- ; return 0; }
- EOF
--if { (eval echo configure:9558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_NAME=yes
- else
-@@ -9575,13 +9619,13 @@
- fi 
- 
- echo $ac_n "checking for ut_user in utmp""... $ac_c" 1>&6
--echo "configure:9579: checking for ut_user in utmp" >&5
-+echo "configure:9623: checking for ut_user in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_USER'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9585 "configure"
-+#line 9629 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9589,7 +9633,7 @@
- struct utmp ut;  ut.ut_user[0] = 'a';
- ; return 0; }
- EOF
--if { (eval echo configure:9593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_USER=yes
- else
-@@ -9610,13 +9654,13 @@
- fi 
- 
- echo $ac_n "checking for ut_id in utmp""... $ac_c" 1>&6
--echo "configure:9614: checking for ut_id in utmp" >&5
-+echo "configure:9658: checking for ut_id in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_ID'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9620 "configure"
-+#line 9664 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9624,7 +9668,7 @@
- struct utmp ut;  ut.ut_id[0] = 'a';
- ; return 0; }
- EOF
--if { (eval echo configure:9628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_ID=yes
- else
-@@ -9645,13 +9689,13 @@
- fi 
- 
- echo $ac_n "checking for ut_host in utmp""... $ac_c" 1>&6
--echo "configure:9649: checking for ut_host in utmp" >&5
-+echo "configure:9693: checking for ut_host in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_HOST'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9655 "configure"
-+#line 9699 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9659,7 +9703,7 @@
- struct utmp ut;  ut.ut_host[0] = 'a';
- ; return 0; }
- EOF
--if { (eval echo configure:9663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_HOST=yes
- else
-@@ -9680,13 +9724,13 @@
- fi 
- 
- echo $ac_n "checking for ut_time in utmp""... $ac_c" 1>&6
--echo "configure:9684: checking for ut_time in utmp" >&5
-+echo "configure:9728: checking for ut_time in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TIME'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9690 "configure"
-+#line 9734 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9694,7 +9738,7 @@
- struct utmp ut;  time_t t; ut.ut_time = t;
- ; return 0; }
- EOF
--if { (eval echo configure:9698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_TIME=yes
- else
-@@ -9715,13 +9759,13 @@
- fi 
- 
- echo $ac_n "checking for ut_tv in utmp""... $ac_c" 1>&6
--echo "configure:9719: checking for ut_tv in utmp" >&5
-+echo "configure:9763: checking for ut_tv in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TV'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9725 "configure"
-+#line 9769 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9729,7 +9773,7 @@
- struct utmp ut;  struct timeval tv; ut.ut_tv = tv;
- ; return 0; }
- EOF
--if { (eval echo configure:9733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_TV=yes
- else
-@@ -9750,13 +9794,13 @@
- fi 
- 
- echo $ac_n "checking for ut_type in utmp""... $ac_c" 1>&6
--echo "configure:9754: checking for ut_type in utmp" >&5
-+echo "configure:9798: checking for ut_type in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TYPE'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9760 "configure"
-+#line 9804 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9764,7 +9808,7 @@
- struct utmp ut;  ut.ut_type = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:9768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_TYPE=yes
- else
-@@ -9785,13 +9829,13 @@
- fi 
- 
- echo $ac_n "checking for ut_pid in utmp""... $ac_c" 1>&6
--echo "configure:9789: checking for ut_pid in utmp" >&5
-+echo "configure:9833: checking for ut_pid in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_PID'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9795 "configure"
-+#line 9839 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9799,7 +9843,7 @@
- struct utmp ut;  ut.ut_pid = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:9803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_PID=yes
- else
-@@ -9820,13 +9864,13 @@
- fi 
- 
- echo $ac_n "checking for ut_exit in utmp""... $ac_c" 1>&6
--echo "configure:9824: checking for ut_exit in utmp" >&5
-+echo "configure:9868: checking for ut_exit in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_EXIT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9830 "configure"
-+#line 9874 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9834,7 +9878,7 @@
- struct utmp ut;  ut.ut_exit.e_exit = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:9838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_EXIT=yes
- else
-@@ -9855,13 +9899,13 @@
- fi 
- 
- echo $ac_n "checking for ut_addr in utmp""... $ac_c" 1>&6
--echo "configure:9859: checking for ut_addr in utmp" >&5
-+echo "configure:9903: checking for ut_addr in utmp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_ADDR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9865 "configure"
-+#line 9909 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9869,7 +9913,7 @@
- struct utmp ut;  ut.ut_addr = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:9873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UT_UT_ADDR=yes
- else
-@@ -9891,13 +9935,13 @@
- 
- if test x$ac_cv_func_pututline = xyes ; then
-   echo $ac_n "checking whether pututline returns pointer""... $ac_c" 1>&6
--echo "configure:9895: checking whether pututline returns pointer" >&5
-+echo "configure:9939: checking whether pututline returns pointer" >&5
- if eval "test \"`echo '$''{'samba_cv_PUTUTLINE_RETURNS_UTMP'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-   cat > conftest.$ac_ext <<EOF
--#line 9901 "configure"
-+#line 9945 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmp.h>
-@@ -9905,7 +9949,7 @@
- struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);
- ; return 0; }
- EOF
--if { (eval echo configure:9909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_PUTUTLINE_RETURNS_UTMP=yes
- else
-@@ -9927,13 +9971,13 @@
- fi
- 
- echo $ac_n "checking for ut_syslen in utmpx""... $ac_c" 1>&6
--echo "configure:9931: checking for ut_syslen in utmpx" >&5
-+echo "configure:9975: checking for ut_syslen in utmpx" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UX_UT_SYSLEN'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 9937 "configure"
-+#line 9981 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utmpx.h>
-@@ -9941,7 +9985,7 @@
- struct utmpx ux;  ux.ut_syslen = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:9945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UX_UT_SYSLEN=yes
- else
-@@ -9962,7 +10006,7 @@
- fi 
- 
- echo $ac_n "checking for Linux kernel oplocks""... $ac_c" 1>&6
--echo "configure:9966: checking for Linux kernel oplocks" >&5
-+echo "configure:10010: checking for Linux kernel oplocks" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_OPLOCKS_LINUX'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9971,7 +10015,7 @@
-   samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9975 "configure"
-+#line 10019 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9985,7 +10029,7 @@
- }
- 
- EOF
--if { (eval echo configure:9989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes
- else
-@@ -10008,7 +10052,7 @@
- fi
- 
- echo $ac_n "checking for kernel change notify support""... $ac_c" 1>&6
--echo "configure:10012: checking for kernel change notify support" >&5
-+echo "configure:10056: checking for kernel change notify support" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_CHANGE_NOTIFY'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10017,7 +10061,7 @@
-   samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10021 "configure"
-+#line 10065 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10031,7 +10075,7 @@
- }
- 
- EOF
--if { (eval echo configure:10035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
- else
-@@ -10054,7 +10098,7 @@
- fi
- 
- echo $ac_n "checking for kernel share modes""... $ac_c" 1>&6
--echo "configure:10058: checking for kernel share modes" >&5
-+echo "configure:10102: checking for kernel share modes" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_SHARE_MODES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10063,7 +10107,7 @@
-   samba_cv_HAVE_KERNEL_SHARE_MODES=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10067 "configure"
-+#line 10111 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10079,7 +10123,7 @@
- }
- 
- EOF
--if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_KERNEL_SHARE_MODES=yes
- else
-@@ -10105,13 +10149,13 @@
- 
- 
- echo $ac_n "checking for IRIX kernel oplock type definitions""... $ac_c" 1>&6
--echo "configure:10109: checking for IRIX kernel oplock type definitions" >&5
-+echo "configure:10153: checking for IRIX kernel oplock type definitions" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_OPLOCKS_IRIX'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 10115 "configure"
-+#line 10159 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <fcntl.h>
-@@ -10119,7 +10163,7 @@
- oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;
- ; return 0; }
- EOF
--if { (eval echo configure:10123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
- else
-@@ -10140,7 +10184,7 @@
- fi
- 
- echo $ac_n "checking for irix specific capabilities""... $ac_c" 1>&6
--echo "configure:10144: checking for irix specific capabilities" >&5
-+echo "configure:10188: checking for irix specific capabilities" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10149,7 +10193,7 @@
-   samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10153 "configure"
-+#line 10197 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/capability.h>
-@@ -10164,7 +10208,7 @@
- }
- 
- EOF
--if { (eval echo configure:10168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=yes
- else
-@@ -10192,13 +10236,13 @@
- #
- 
- echo $ac_n "checking for int16 typedef included by rpc/rpc.h""... $ac_c" 1>&6
--echo "configure:10196: checking for int16 typedef included by rpc/rpc.h" >&5
-+echo "configure:10240: checking for int16 typedef included by rpc/rpc.h" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_INT16_FROM_RPC_RPC_H'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 10202 "configure"
-+#line 10246 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if defined(HAVE_RPC_RPC_H)
-@@ -10208,7 +10252,7 @@
- int16 testvar;
- ; return 0; }
- EOF
--if { (eval echo configure:10212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_INT16_FROM_RPC_RPC_H=yes
- else
-@@ -10229,13 +10273,13 @@
- fi
- 
- echo $ac_n "checking for uint16 typedef included by rpc/rpc.h""... $ac_c" 1>&6
--echo "configure:10233: checking for uint16 typedef included by rpc/rpc.h" >&5
-+echo "configure:10277: checking for uint16 typedef included by rpc/rpc.h" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UINT16_FROM_RPC_RPC_H'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 10239 "configure"
-+#line 10283 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if defined(HAVE_RPC_RPC_H)
-@@ -10245,7 +10289,7 @@
- uint16 testvar;
- ; return 0; }
- EOF
--if { (eval echo configure:10249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=yes
- else
-@@ -10266,13 +10310,13 @@
- fi
- 
- echo $ac_n "checking for int32 typedef included by rpc/rpc.h""... $ac_c" 1>&6
--echo "configure:10270: checking for int32 typedef included by rpc/rpc.h" >&5
-+echo "configure:10314: checking for int32 typedef included by rpc/rpc.h" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_INT32_FROM_RPC_RPC_H'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 10276 "configure"
-+#line 10320 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if defined(HAVE_RPC_RPC_H)
-@@ -10282,7 +10326,7 @@
- int32 testvar;
- ; return 0; }
- EOF
--if { (eval echo configure:10286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes
- else
-@@ -10303,13 +10347,13 @@
- fi
- 
- echo $ac_n "checking for uint32 typedef included by rpc/rpc.h""... $ac_c" 1>&6
--echo "configure:10307: checking for uint32 typedef included by rpc/rpc.h" >&5
-+echo "configure:10351: checking for uint32 typedef included by rpc/rpc.h" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_UINT32_FROM_RPC_RPC_H'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 10313 "configure"
-+#line 10357 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if defined(HAVE_RPC_RPC_H)
-@@ -10319,7 +10363,7 @@
- uint32 testvar;
- ; return 0; }
- EOF
--if { (eval echo configure:10323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=yes
- else
-@@ -10341,13 +10385,13 @@
- 
- 
- echo $ac_n "checking for conflicting AUTH_ERROR define in rpc/rpc.h""... $ac_c" 1>&6
--echo "configure:10345: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
-+echo "configure:10389: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 10351 "configure"
-+#line 10395 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_SYS_SECURITY_H
-@@ -10361,7 +10405,7 @@
- int testvar;
- ; return 0; }
- EOF
--if { (eval echo configure:10365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no
- else
-@@ -10382,16 +10426,16 @@
- fi
- 
- echo $ac_n "checking for test routines""... $ac_c" 1>&6
--echo "configure:10386: checking for test routines" >&5
-+echo "configure:10430: checking for test routines" >&5
- if test "$cross_compiling" = yes; then
-   echo "configure: warning: cannot run when cross-compiling" 1>&2
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10391 "configure"
-+#line 10435 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/trivial.c"
- EOF
--if { (eval echo configure:10395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   echo "$ac_t""yes" 1>&6
- else
-@@ -10405,7 +10449,7 @@
- 
- 
- echo $ac_n "checking for ftruncate extend""... $ac_c" 1>&6
--echo "configure:10409: checking for ftruncate extend" >&5
-+echo "configure:10453: checking for ftruncate extend" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_FTRUNCATE_EXTEND'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10414,11 +10458,11 @@
-   samba_cv_HAVE_FTRUNCATE_EXTEND=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10418 "configure"
-+#line 10462 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/ftruncate.c"
- EOF
--if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_FTRUNCATE_EXTEND=yes
- else
-@@ -10441,7 +10485,7 @@
- fi
- 
- echo $ac_n "checking for broken getgroups""... $ac_c" 1>&6
--echo "configure:10445: checking for broken getgroups" >&5
-+echo "configure:10489: checking for broken getgroups" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_GETGROUPS'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10450,11 +10494,11 @@
-   samba_cv_HAVE_BROKEN_GETGROUPS=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10454 "configure"
-+#line 10498 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/getgroups.c"
- EOF
--if { (eval echo configure:10458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_BROKEN_GETGROUPS=yes
- else
-@@ -10477,7 +10521,7 @@
- fi
- 
- echo $ac_n "checking whether getpass should be replaced""... $ac_c" 1>&6
--echo "configure:10481: checking whether getpass should be replaced" >&5
-+echo "configure:10525: checking whether getpass should be replaced" >&5
- if eval "test \"`echo '$''{'samba_cv_REPLACE_GETPASS'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10485,7 +10529,7 @@
- SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/smbwrapper"
- cat > conftest.$ac_ext <<EOF
--#line 10489 "configure"
-+#line 10533 "configure"
- #include "confdefs.h"
- 
- #define REPLACE_GETPASS 1
-@@ -10498,7 +10542,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_REPLACE_GETPASS=yes
- else
-@@ -10521,7 +10565,7 @@
- fi
- 
- echo $ac_n "checking for broken inet_ntoa""... $ac_c" 1>&6
--echo "configure:10525: checking for broken inet_ntoa" >&5
-+echo "configure:10569: checking for broken inet_ntoa" >&5
- if eval "test \"`echo '$''{'samba_cv_REPLACE_INET_NTOA'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10530,7 +10574,7 @@
-   samba_cv_REPLACE_INET_NTOA=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10534 "configure"
-+#line 10578 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -10544,7 +10588,7 @@
-     strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } 
- exit(1);}
- EOF
--if { (eval echo configure:10548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_REPLACE_INET_NTOA=yes
- else
-@@ -10567,7 +10611,7 @@
- fi
- 
- echo $ac_n "checking for secure mkstemp""... $ac_c" 1>&6
--echo "configure:10571: checking for secure mkstemp" >&5
-+echo "configure:10615: checking for secure mkstemp" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_SECURE_MKSTEMP'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10576,7 +10620,7 @@
-   samba_cv_HAVE_SECURE_MKSTEMP=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10580 "configure"
-+#line 10624 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <sys/types.h>
-@@ -10593,7 +10637,7 @@
-   exit(0);
- }
- EOF
--if { (eval echo configure:10597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_SECURE_MKSTEMP=yes
- else
-@@ -10616,7 +10660,7 @@
- fi
- 
- echo $ac_n "checking for sysconf(_SC_NGROUPS_MAX)""... $ac_c" 1>&6
--echo "configure:10620: checking for sysconf(_SC_NGROUPS_MAX)" >&5
-+echo "configure:10664: checking for sysconf(_SC_NGROUPS_MAX)" >&5
- if eval "test \"`echo '$''{'samba_cv_SYSCONF_SC_NGROUPS_MAX'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10625,12 +10669,12 @@
-   samba_cv_SYSCONF_SC_NGROUPS_MAX=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10629 "configure"
-+#line 10673 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- main() { exit(sysconf(_SC_NGROUPS_MAX) == -1 ? 1 : 0); }
- EOF
--if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_SYSCONF_SC_NGROUPS_MAX=yes
- else
-@@ -10653,7 +10697,7 @@
- fi
- 
- echo $ac_n "checking for root""... $ac_c" 1>&6
--echo "configure:10657: checking for root" >&5
-+echo "configure:10701: checking for root" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_ROOT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10662,11 +10706,11 @@
-   samba_cv_HAVE_ROOT=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10666 "configure"
-+#line 10710 "configure"
- #include "confdefs.h"
- main() { exit(getuid() != 0); }
- EOF
--if { (eval echo configure:10670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_ROOT=yes
- else
-@@ -10694,7 +10738,7 @@
- # look for a method of finding the list of network interfaces
- iface=no;
- echo $ac_n "checking for iface AIX""... $ac_c" 1>&6
--echo "configure:10698: checking for iface AIX" >&5
-+echo "configure:10742: checking for iface AIX" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_AIX'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10703,7 +10747,7 @@
-   samba_cv_HAVE_IFACE_AIX=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10707 "configure"
-+#line 10751 "configure"
- #include "confdefs.h"
- 
- #define HAVE_IFACE_AIX 1
-@@ -10711,7 +10755,7 @@
- #include "confdefs.h"
- #include "${srcdir-.}/lib/interfaces.c"
- EOF
--if { (eval echo configure:10715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_IFACE_AIX=yes
- else
-@@ -10735,7 +10779,7 @@
- 
- if test $iface = no; then
- echo $ac_n "checking for iface ifconf""... $ac_c" 1>&6
--echo "configure:10739: checking for iface ifconf" >&5
-+echo "configure:10783: checking for iface ifconf" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFCONF'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10744,7 +10788,7 @@
-   samba_cv_HAVE_IFACE_IFCONF=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10748 "configure"
-+#line 10792 "configure"
- #include "confdefs.h"
- 
- #define HAVE_IFACE_IFCONF 1
-@@ -10752,7 +10796,7 @@
- #include "confdefs.h"
- #include "${srcdir-.}/lib/interfaces.c"
- EOF
--if { (eval echo configure:10756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_IFACE_IFCONF=yes
- else
-@@ -10777,7 +10821,7 @@
- 
- if test $iface = no; then
- echo $ac_n "checking for iface ifreq""... $ac_c" 1>&6
--echo "configure:10781: checking for iface ifreq" >&5
-+echo "configure:10825: checking for iface ifreq" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFREQ'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10786,7 +10830,7 @@
-   samba_cv_HAVE_IFACE_IFREQ=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10790 "configure"
-+#line 10834 "configure"
- #include "confdefs.h"
- 
- #define HAVE_IFACE_IFREQ 1
-@@ -10794,7 +10838,7 @@
- #include "confdefs.h"
- #include "${srcdir-.}/lib/interfaces.c"
- EOF
--if { (eval echo configure:10798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_IFACE_IFREQ=yes
- else
-@@ -10823,7 +10867,7 @@
- seteuid=no;
- if test $seteuid = no; then
- echo $ac_n "checking for setresuid""... $ac_c" 1>&6
--echo "configure:10827: checking for setresuid" >&5
-+echo "configure:10871: checking for setresuid" >&5
- if eval "test \"`echo '$''{'samba_cv_USE_SETRESUID'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10832,7 +10876,7 @@
-   samba_cv_USE_SETRESUID=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10836 "configure"
-+#line 10880 "configure"
- #include "confdefs.h"
- 
- #define AUTOCONF_TEST 1
-@@ -10840,7 +10884,7 @@
- #include "confdefs.h"
- #include "${srcdir-.}/lib/util_sec.c"
- EOF
--if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_USE_SETRESUID=yes
- else
-@@ -10866,7 +10910,7 @@
- 
- if test $seteuid = no; then
- echo $ac_n "checking for setreuid""... $ac_c" 1>&6
--echo "configure:10870: checking for setreuid" >&5
-+echo "configure:10914: checking for setreuid" >&5
- if eval "test \"`echo '$''{'samba_cv_USE_SETREUID'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10875,7 +10919,7 @@
-   samba_cv_USE_SETREUID=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10879 "configure"
-+#line 10923 "configure"
- #include "confdefs.h"
- 
- #define AUTOCONF_TEST 1
-@@ -10883,7 +10927,7 @@
- #include "confdefs.h"
- #include "${srcdir-.}/lib/util_sec.c"
- EOF
--if { (eval echo configure:10887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_USE_SETREUID=yes
- else
-@@ -10908,7 +10952,7 @@
- 
- if test $seteuid = no; then
- echo $ac_n "checking for seteuid""... $ac_c" 1>&6
--echo "configure:10912: checking for seteuid" >&5
-+echo "configure:10956: checking for seteuid" >&5
- if eval "test \"`echo '$''{'samba_cv_USE_SETEUID'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10917,7 +10961,7 @@
-   samba_cv_USE_SETEUID=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10921 "configure"
-+#line 10965 "configure"
- #include "confdefs.h"
- 
- #define AUTOCONF_TEST 1
-@@ -10925,7 +10969,7 @@
- #include "confdefs.h"
- #include "${srcdir-.}/lib/util_sec.c"
- EOF
--if { (eval echo configure:10929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_USE_SETEUID=yes
- else
-@@ -10950,7 +10994,7 @@
- 
- if test $seteuid = no; then
- echo $ac_n "checking for setuidx""... $ac_c" 1>&6
--echo "configure:10954: checking for setuidx" >&5
-+echo "configure:10998: checking for setuidx" >&5
- if eval "test \"`echo '$''{'samba_cv_USE_SETUIDX'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -10959,7 +11003,7 @@
-   samba_cv_USE_SETUIDX=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10963 "configure"
-+#line 11007 "configure"
- #include "confdefs.h"
- 
- #define AUTOCONF_TEST 1
-@@ -10967,7 +11011,7 @@
- #include "confdefs.h"
- #include "${srcdir-.}/lib/util_sec.c"
- EOF
--if { (eval echo configure:10971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_USE_SETUIDX=yes
- else
-@@ -10992,7 +11036,7 @@
- 
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:10996: checking for working mmap" >&5
-+echo "configure:11040: checking for working mmap" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_MMAP'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11001,11 +11045,11 @@
-   samba_cv_HAVE_MMAP=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11005 "configure"
-+#line 11049 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/shared_mmap.c"
- EOF
--if { (eval echo configure:11009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_MMAP=yes
- else
-@@ -11028,7 +11072,7 @@
- fi
- 
- echo $ac_n "checking for ftruncate needs root""... $ac_c" 1>&6
--echo "configure:11032: checking for ftruncate needs root" >&5
-+echo "configure:11076: checking for ftruncate needs root" >&5
- if eval "test \"`echo '$''{'samba_cv_FTRUNCATE_NEEDS_ROOT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11037,11 +11081,11 @@
-   samba_cv_FTRUNCATE_NEEDS_ROOT=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11041 "configure"
-+#line 11085 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/ftruncroot.c"
- EOF
--if { (eval echo configure:11045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_FTRUNCATE_NEEDS_ROOT=yes
- else
-@@ -11064,7 +11108,7 @@
- fi
- 
- echo $ac_n "checking for fcntl locking""... $ac_c" 1>&6
--echo "configure:11068: checking for fcntl locking" >&5
-+echo "configure:11112: checking for fcntl locking" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_FCNTL_LOCK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11073,11 +11117,11 @@
-   samba_cv_HAVE_FCNTL_LOCK=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11077 "configure"
-+#line 11121 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/fcntl_lock.c"
- EOF
--if { (eval echo configure:11081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_FCNTL_LOCK=yes
- else
-@@ -11100,7 +11144,7 @@
- fi
- 
- echo $ac_n "checking for broken (glibc2.1/x86) 64 bit fcntl locking""... $ac_c" 1>&6
--echo "configure:11104: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5
-+echo "configure:11148: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_FCNTL64_LOCKS'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11109,11 +11153,11 @@
-   samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11113 "configure"
-+#line 11157 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/fcntl_lock64.c"
- EOF
--if { (eval echo configure:11117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=yes
- else
-@@ -11138,7 +11182,7 @@
- 
- 
-   echo $ac_n "checking for 64 bit fcntl locking""... $ac_c" 1>&6
--echo "configure:11142: checking for 64 bit fcntl locking" >&5
-+echo "configure:11186: checking for 64 bit fcntl locking" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_FLOCK64'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11147,7 +11191,7 @@
-   samba_cv_HAVE_STRUCT_FLOCK64=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11151 "configure"
-+#line 11195 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -11171,7 +11215,7 @@
- #endif
- }
- EOF
--if { (eval echo configure:11175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_STRUCT_FLOCK64=yes
- else
-@@ -11196,13 +11240,13 @@
- fi
- 
- echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
--echo "configure:11200: checking for st_blocks in struct stat" >&5
-+echo "configure:11244: checking for st_blocks in struct stat" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_STAT_ST_BLOCKS'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 11206 "configure"
-+#line 11250 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -11211,7 +11255,7 @@
- struct stat st;  st.st_blocks = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_STAT_ST_BLOCKS=yes
- else
-@@ -11234,13 +11278,13 @@
- case "$host_os" in
- *linux*)
- echo $ac_n "checking for broken RedHat 7.2 system header files""... $ac_c" 1>&6
--echo "configure:11238: checking for broken RedHat 7.2 system header files" >&5
-+echo "configure:11282: checking for broken RedHat 7.2 system header files" >&5
- if eval "test \"`echo '$''{'samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 11244 "configure"
-+#line 11288 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_SYS_VFS_H
-@@ -11254,7 +11298,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:11258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
- else
-@@ -11277,13 +11321,13 @@
- esac
- 
- echo $ac_n "checking for broken nisplus include files""... $ac_c" 1>&6
--echo "configure:11281: checking for broken nisplus include files" >&5
-+echo "configure:11325: checking for broken nisplus include files" >&5
- if eval "test \"`echo '$''{'samba_cv_BROKEN_NISPLUS_INCLUDE_FILES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 11287 "configure"
-+#line 11331 "configure"
- #include "confdefs.h"
- #include <sys/acl.h>
- #if defined(HAVE_RPCSVC_NIS_H)
-@@ -11293,7 +11337,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:11297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no
- else
-@@ -11317,7 +11361,7 @@
- #################################################
- # check for smbwrapper support
- echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6
--echo "configure:11321: checking whether to use smbwrapper" >&5
-+echo "configure:11365: checking whether to use smbwrapper" >&5
- # Check whether --with-smbwrapper or --without-smbwrapper was given.
- if test "${with_smbwrapper+set}" = set; then
-   withval="$with_smbwrapper"
-@@ -11361,7 +11405,7 @@
- #################################################
- # check for the AFS filesystem
- echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6
--echo "configure:11365: checking whether to use AFS" >&5
-+echo "configure:11409: checking whether to use AFS" >&5
- # Check whether --with-afs or --without-afs was given.
- if test "${with_afs+set}" = set; then
-   withval="$with_afs"
-@@ -11387,7 +11431,7 @@
- #################################################
- # check for the DFS auth system
- echo $ac_n "checking whether to use DCE/DFS auth""... $ac_c" 1>&6
--echo "configure:11391: checking whether to use DCE/DFS auth" >&5
-+echo "configure:11435: checking whether to use DCE/DFS auth" >&5
- # Check whether --with-dfs or --without-dfs was given.
- if test "${with_dfs+set}" = set; then
-   withval="$with_dfs"
-@@ -11412,7 +11456,7 @@
- #################################################
- # check for Kerberos IV auth system
- echo $ac_n "checking whether to use Kerberos IV""... $ac_c" 1>&6
--echo "configure:11416: checking whether to use Kerberos IV" >&5
-+echo "configure:11460: checking whether to use Kerberos IV" >&5
- # Check whether --with-krb4 or --without-krb4 was given.
- if test "${with_krb4+set}" = set; then
-   withval="$with_krb4"
-@@ -11424,7 +11468,7 @@
- EOF
- 
-     echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
--echo "configure:11428: checking for dn_expand in -lresolv" >&5
-+echo "configure:11472: checking for dn_expand in -lresolv" >&5
- ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -11432,7 +11476,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lresolv  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11436 "configure"
-+#line 11480 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -11443,7 +11487,7 @@
- dn_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:11447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11487,7 +11531,7 @@
- #################################################
- # check for Kerberos 5 auth system
- echo $ac_n "checking whether to use Kerberos 5""... $ac_c" 1>&6
--echo "configure:11491: checking whether to use Kerberos 5" >&5
-+echo "configure:11535: checking whether to use Kerberos 5" >&5
- # Check whether --with-krb5 or --without-krb5 was given.
- if test "${with_krb5+set}" = set; then
-   withval="$with_krb5"
-@@ -11515,7 +11559,7 @@
- #################################################
- # check for automount support
- echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6
--echo "configure:11519: checking whether to use AUTOMOUNT" >&5
-+echo "configure:11563: checking whether to use AUTOMOUNT" >&5
- # Check whether --with-automount or --without-automount was given.
- if test "${with_automount+set}" = set; then
-   withval="$with_automount"
-@@ -11540,7 +11584,7 @@
- #################################################
- # check for smbmount support
- echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6
--echo "configure:11544: checking whether to use SMBMOUNT" >&5
-+echo "configure:11588: checking whether to use SMBMOUNT" >&5
- # Check whether --with-smbmount or --without-smbmount was given.
- if test "${with_smbmount+set}" = set; then
-   withval="$with_smbmount"
-@@ -11577,7 +11621,7 @@
- # check for a PAM password database
- with_pam_for_crypt=no
- echo $ac_n "checking whether to use PAM password database""... $ac_c" 1>&6
--echo "configure:11581: checking whether to use PAM password database" >&5
-+echo "configure:11625: checking whether to use PAM password database" >&5
- # Check whether --with-pam or --without-pam was given.
- if test "${with_pam+set}" = set; then
-   withval="$with_pam"
-@@ -11603,7 +11647,7 @@
- 
- # we can't build a pam module if we don't have pam.
- echo $ac_n "checking for pam_get_data in -lpam""... $ac_c" 1>&6
--echo "configure:11607: checking for pam_get_data in -lpam" >&5
-+echo "configure:11651: checking for pam_get_data in -lpam" >&5
- ac_lib_var=`echo pam'_'pam_get_data | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -11611,7 +11655,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lpam  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11615 "configure"
-+#line 11659 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -11622,7 +11666,7 @@
- pam_get_data()
- ; return 0; }
- EOF
--if { (eval echo configure:11626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11649,7 +11693,7 @@
- #################################################
- # check for pam_smbpass support
- echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6
--echo "configure:11653: checking whether to use pam_smbpass" >&5
-+echo "configure:11697: checking whether to use pam_smbpass" >&5
- # Check whether --with-pam_smbpass or --without-pam_smbpass was given.
- if test "${with_pam_smbpass+set}" = set; then
-   withval="$with_pam_smbpass"
-@@ -11691,12 +11735,12 @@
- for ac_func in crypt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:11695: checking for $ac_func" >&5
-+echo "configure:11739: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11700 "configure"
-+#line 11744 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11719,7 +11763,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -11745,7 +11789,7 @@
- 
- if test x"$ac_cv_func_crypt" = x"no"; then
-     echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:11749: checking for crypt in -lcrypt" >&5
-+echo "configure:11793: checking for crypt in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -11753,7 +11797,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11757 "configure"
-+#line 11801 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -11764,7 +11808,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:11768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11799,7 +11843,7 @@
- ##
- if test $with_pam_for_crypt = no; then
- echo $ac_n "checking for a crypt that needs truncated salt""... $ac_c" 1>&6
--echo "configure:11803: checking for a crypt that needs truncated salt" >&5
-+echo "configure:11847: checking for a crypt that needs truncated salt" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_TRUNCATED_SALT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11808,11 +11852,11 @@
-   samba_cv_HAVE_TRUNCATED_SALT=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11812 "configure"
-+#line 11856 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/crypttest.c"
- EOF
--if { (eval echo configure:11816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   samba_cv_HAVE_TRUNCATED_SALT=no
- else
-@@ -11850,7 +11894,7 @@
- #################################################
- # check for a TDB password database
- echo $ac_n "checking whether to use TDB SAM database""... $ac_c" 1>&6
--echo "configure:11854: checking whether to use TDB SAM database" >&5
-+echo "configure:11898: checking whether to use TDB SAM database" >&5
- # Check whether --with-tdbsam or --without-tdbsam was given.
- if test "${with_tdbsam+set}" = set; then
-   withval="$with_tdbsam"
-@@ -11876,7 +11920,7 @@
- #################################################
- # check for a LDAP password database
- echo $ac_n "checking whether to use LDAP SAM database""... $ac_c" 1>&6
--echo "configure:11880: checking whether to use LDAP SAM database" >&5
-+echo "configure:11924: checking whether to use LDAP SAM database" >&5
- # Check whether --with-ldapsam or --without-ldapsam was given.
- if test "${with_ldapsam+set}" = set; then
-   withval="$with_ldapsam"
-@@ -11903,7 +11947,7 @@
- #################################################
- # check for a NISPLUS password database
- echo $ac_n "checking whether to use NISPLUS SAM database""... $ac_c" 1>&6
--echo "configure:11907: checking whether to use NISPLUS SAM database" >&5
-+echo "configure:11951: checking whether to use NISPLUS SAM database" >&5
- # Check whether --with-nisplussam or --without-nisplussam was given.
- if test "${with_nisplussam+set}" = set; then
-   withval="$with_nisplussam"
-@@ -11931,7 +11975,7 @@
- # smbpasswd SAM is only used if another format
- # has not been defined
- echo $ac_n "checking whether to use traditional smbpasswd file""... $ac_c" 1>&6
--echo "configure:11935: checking whether to use traditional smbpasswd file" >&5
-+echo "configure:11979: checking whether to use traditional smbpasswd file" >&5
- if test $with_smbpasswd_sam = yes; then
- 	echo "$ac_t""yes" 1>&6
- 	cat >> confdefs.h <<\EOF
-@@ -11953,7 +11997,7 @@
- #################################################
- # check for a NISPLUS_HOME support 
- echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6
--echo "configure:11957: checking whether to use NISPLUS_HOME" >&5
-+echo "configure:12001: checking whether to use NISPLUS_HOME" >&5
- # Check whether --with-nisplus-home or --without-nisplus-home was given.
- if test "${with_nisplus_home+set}" = set; then
-   withval="$with_nisplus_home"
-@@ -11978,7 +12022,7 @@
- #################################################
- # check for the secure socket layer
- echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6
--echo "configure:11982: checking whether to use SSL" >&5
-+echo "configure:12026: checking whether to use SSL" >&5
- # Check whether --with-ssl or --without-ssl was given.
- if test "${with_ssl+set}" = set; then
-   withval="$with_ssl"
-@@ -12052,7 +12096,7 @@
- #################################################
- # check for syslog logging
- echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6
--echo "configure:12056: checking whether to use syslog logging" >&5
-+echo "configure:12100: checking whether to use syslog logging" >&5
- # Check whether --with-syslog or --without-syslog was given.
- if test "${with_syslog+set}" = set; then
-   withval="$with_syslog"
-@@ -12077,7 +12121,7 @@
- #################################################
- # check for a shared memory profiling support
- echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6
--echo "configure:12081: checking whether to use profiling" >&5
-+echo "configure:12125: checking whether to use profiling" >&5
- # Check whether --with-profiling-data or --without-profiling-data was given.
- if test "${with_profiling_data+set}" = set; then
-   withval="$with_profiling_data"
-@@ -12105,7 +12149,7 @@
- QUOTAOBJS=smbd/noquotas.o
- 
- echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6
--echo "configure:12109: checking whether to support disk-quotas" >&5
-+echo "configure:12153: checking whether to support disk-quotas" >&5
- # Check whether --with-quotas or --without-quotas was given.
- if test "${with_quotas+set}" = set; then
-   withval="$with_quotas"
-@@ -12117,13 +12161,13 @@
-       *linux*)
-         # Check for kernel 2.4.x quota braindamage...
- 	echo $ac_n "checking for linux 2.4.x quota braindamage..""... $ac_c" 1>&6
--echo "configure:12121: checking for linux 2.4.x quota braindamage.." >&5
-+echo "configure:12165: checking for linux 2.4.x quota braindamage.." >&5
- if eval "test \"`echo '$''{'samba_cv_linux_2_4_quota_braindamage'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-         cat > conftest.$ac_ext <<EOF
--#line 12127 "configure"
-+#line 12171 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <sys/types.h>
-@@ -12135,7 +12179,7 @@
- struct mem_dqblk D;
- ; return 0; }
- EOF
--if { (eval echo configure:12139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_linux_2_4_quota_braindamage=yes
- else
-@@ -12179,7 +12223,7 @@
- # check for experimental utmp accounting
- 
- echo $ac_n "checking whether to support utmp accounting""... $ac_c" 1>&6
--echo "configure:12183: checking whether to support utmp accounting" >&5
-+echo "configure:12227: checking whether to support utmp accounting" >&5
- # Check whether --with-utmp or --without-utmp was given.
- if test "${with_utmp+set}" = set; then
-   withval="$with_utmp"
-@@ -12205,7 +12249,7 @@
- # check for MS Dfs support
- 
- echo $ac_n "checking whether to support Microsoft Dfs""... $ac_c" 1>&6
--echo "configure:12209: checking whether to support Microsoft Dfs" >&5
-+echo "configure:12253: checking whether to support Microsoft Dfs" >&5
- # Check whether --with-msdfs or --without-msdfs was given.
- if test "${with_msdfs+set}" = set; then
-   withval="$with_msdfs"
-@@ -12231,7 +12275,7 @@
- # check for Samba VFS support
- 
- echo $ac_n "checking whether to support the experimental Samba vfs""... $ac_c" 1>&6
--echo "configure:12235: checking whether to support the experimental Samba vfs" >&5
-+echo "configure:12279: checking whether to support the experimental Samba vfs" >&5
- # Check whether --with-vfs or --without-vfs was given.
- if test "${with_vfs+set}" = set; then
-   withval="$with_vfs"
-@@ -12258,9 +12302,9 @@
- # should we build libsmbclient?
- 
- LIBSMBCLIENT_SHARED=
--LIBSMBCLIENT=
-+LIBSMBCLIENT_STATIC=
- echo $ac_n "checking whether to build the libsmbclient shared library""... $ac_c" 1>&6
--echo "configure:12264: checking whether to build the libsmbclient shared library" >&5
-+echo "configure:12308: checking whether to build the libsmbclient shared library" >&5
- # Check whether --with-libsmbclient or --without-libsmbclient was given.
- if test "${with_libsmbclient+set}" = set; then
-   withval="$with_libsmbclient"
-@@ -12268,10 +12312,10 @@
-   yes)
-      if test $BLDSHARED = true; then
-         LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
--	LIBSMBCLIENT=libsmbclient
-+        LIBSMBCLIENT_STATIC=bin/libsmbclient.a
-         echo "$ac_t""yes" 1>&6
-      else
--        echo "$ac_t""no shared library support" 1>&6
-+        echo "$ac_t""no static or shared libsmbclient support" 1>&6
-      fi
-      ;;
-   *)
-@@ -12287,14 +12331,14 @@
- #################################################
- # these tests are taken from the GNU fileutils package
- echo "checking how to get filesystem space usage" 1>&6
--echo "configure:12291: checking how to get filesystem space usage" >&5
-+echo "configure:12335: checking how to get filesystem space usage" >&5
- space=no
- 
- # Test for statvfs64.
- if test $space = no; then
-   # SVR4
-   echo $ac_n "checking statvfs64 function (SVR4)""... $ac_c" 1>&6
--echo "configure:12298: checking statvfs64 function (SVR4)" >&5
-+echo "configure:12342: checking statvfs64 function (SVR4)" >&5
- if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12302,7 +12346,7 @@
-   fu_cv_sys_stat_statvfs64=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 12306 "configure"
-+#line 12350 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_UNISTD_H)
-@@ -12316,7 +12360,7 @@
-     exit (statvfs64 (".", &fsd));
-   }
- EOF
--if { (eval echo configure:12320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   fu_cv_sys_stat_statvfs64=yes
- else
-@@ -12349,12 +12393,12 @@
- if test $space = no; then
-   # SVR4
-   echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6
--echo "configure:12353: checking statvfs function (SVR4)" >&5
-+echo "configure:12397: checking statvfs function (SVR4)" >&5
- if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 12358 "configure"
-+#line 12402 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/statvfs.h>
-@@ -12362,7 +12406,7 @@
- struct statvfs fsd; statvfs (0, &fsd);
- ; return 0; }
- EOF
--if { (eval echo configure:12366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   fu_cv_sys_stat_statvfs=yes
- else
-@@ -12387,7 +12431,7 @@
- if test $space = no; then
-   # DEC Alpha running OSF/1
-   echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
--echo "configure:12391: checking for 3-argument statfs function (DEC OSF/1)" >&5
-+echo "configure:12435: checking for 3-argument statfs function (DEC OSF/1)" >&5
-   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12395,7 +12439,7 @@
-   fu_cv_sys_stat_statfs3_osf1=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 12399 "configure"
-+#line 12443 "configure"
- #include "confdefs.h"
- 
- #include <sys/param.h>
-@@ -12408,7 +12452,7 @@
-     exit (statfs (".", &fsd, sizeof (struct statfs)));
-   }
- EOF
--if { (eval echo configure:12412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   fu_cv_sys_stat_statfs3_osf1=yes
- else
-@@ -12435,7 +12479,7 @@
- if test $space = no; then
- # AIX
-   echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
--echo "configure:12439: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
-+echo "configure:12483: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
-   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12443,7 +12487,7 @@
-   fu_cv_sys_stat_statfs2_bsize=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 12447 "configure"
-+#line 12491 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -12462,7 +12506,7 @@
-   exit (statfs (".", &fsd));
-   }
- EOF
--if { (eval echo configure:12466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   fu_cv_sys_stat_statfs2_bsize=yes
- else
-@@ -12489,7 +12533,7 @@
- if test $space = no; then
- # SVR3
-   echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
--echo "configure:12493: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
-+echo "configure:12537: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
-   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12497,7 +12541,7 @@
-   fu_cv_sys_stat_statfs4=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 12501 "configure"
-+#line 12545 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/statfs.h>
-@@ -12507,7 +12551,7 @@
-   exit (statfs (".", &fsd, sizeof fsd, 0));
-   }
- EOF
--if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   fu_cv_sys_stat_statfs4=yes
- else
-@@ -12534,7 +12578,7 @@
- if test $space = no; then
- # 4.4BSD and NetBSD
-   echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6
--echo "configure:12538: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
-+echo "configure:12582: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
-   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12542,7 +12586,7 @@
-   fu_cv_sys_stat_statfs2_fsize=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 12546 "configure"
-+#line 12590 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_SYS_PARAM_H
-@@ -12558,7 +12602,7 @@
-   exit (statfs (".", &fsd));
-   }
- EOF
--if { (eval echo configure:12562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   fu_cv_sys_stat_statfs2_fsize=yes
- else
-@@ -12585,7 +12629,7 @@
- if test $space = no; then
-   # Ultrix
-   echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
--echo "configure:12589: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
-+echo "configure:12633: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
-   if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12593,7 +12637,7 @@
-   fu_cv_sys_stat_fs_data=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 12597 "configure"
-+#line 12641 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_SYS_PARAM_H
-@@ -12613,7 +12657,7 @@
-   exit (statfs (".", &fsd) != 1);
-   }
- EOF
--if { (eval echo configure:12617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   fu_cv_sys_stat_fs_data=yes
- else
-@@ -12646,9 +12690,9 @@
- # file support.
- #
- echo $ac_n "checking if large file support can be enabled""... $ac_c" 1>&6
--echo "configure:12650: checking if large file support can be enabled" >&5
-+echo "configure:12694: checking if large file support can be enabled" >&5
- cat > conftest.$ac_ext <<EOF
--#line 12652 "configure"
-+#line 12696 "configure"
- #include "confdefs.h"
- 
- #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -12661,7 +12705,7 @@
- int i
- ; return 0; }
- EOF
--if { (eval echo configure:12665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes
- else
-@@ -12728,7 +12772,7 @@
- # check for ACL support
- 
- echo $ac_n "checking whether to support ACLs""... $ac_c" 1>&6
--echo "configure:12732: checking whether to support ACLs" >&5
-+echo "configure:12776: checking whether to support ACLs" >&5
- # Check whether --with-acl-support or --without-acl-support was given.
- if test "${with_acl_support+set}" = set; then
-   withval="$with_acl_support"
-@@ -12781,7 +12825,7 @@
- 			;;
- 		*)
- 		    echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6
--echo "configure:12785: checking for acl_get_file in -lacl" >&5
-+echo "configure:12829: checking for acl_get_file in -lacl" >&5
- ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -12789,7 +12833,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lacl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 12793 "configure"
-+#line 12837 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -12800,7 +12844,7 @@
- acl_get_file()
- ; return 0; }
- EOF
--if { (eval echo configure:12804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -12828,13 +12872,13 @@
- fi
- 
- 			echo $ac_n "checking for ACL support""... $ac_c" 1>&6
--echo "configure:12832: checking for ACL support" >&5
-+echo "configure:12876: checking for ACL support" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_POSIX_ACLS'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 			cat > conftest.$ac_ext <<EOF
--#line 12838 "configure"
-+#line 12882 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/acl.h>
-@@ -12842,7 +12886,7 @@
-  acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);
- ; return 0; }
- EOF
--if { (eval echo configure:12846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   samba_cv_HAVE_POSIX_ACLS=yes
- else
-@@ -12862,13 +12906,13 @@
- EOF
- 
- 				echo $ac_n "checking for acl_get_perm_np""... $ac_c" 1>&6
--echo "configure:12866: checking for acl_get_perm_np" >&5
-+echo "configure:12910: checking for acl_get_perm_np" >&5
- if eval "test \"`echo '$''{'samba_cv_HAVE_ACL_GET_PERM_NP'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 				cat > conftest.$ac_ext <<EOF
--#line 12872 "configure"
-+#line 12916 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/acl.h>
-@@ -12876,7 +12920,7 @@
-  acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);
- ; return 0; }
- EOF
--if { (eval echo configure:12880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   samba_cv_HAVE_ACL_GET_PERM_NP=yes
- else
-@@ -12931,7 +12975,7 @@
- # (WINBIND_STARGETS) and shared libraries (WINBIND_LTARGETS).
- 
- echo $ac_n "checking whether to build winbind""... $ac_c" 1>&6
--echo "configure:12935: checking whether to build winbind" >&5
-+echo "configure:12979: checking whether to build winbind" >&5
- 
- # Initially, the value of $host_os decides whether winbind is supported
- 
-@@ -13010,11 +13054,11 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 13014 "configure"
-+#line 13058 "configure"
- #include "confdefs.h"
- #include "${srcdir-.}/tests/summary.c"
- EOF
--if { (eval echo configure:13018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:13062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   echo "configure OK";
- else
-@@ -13184,7 +13228,7 @@
- s%@SHLIBEXT@%$SHLIBEXT%g
- s%@BLDSHARED@%$BLDSHARED%g
- s%@LIBSMBCLIENT_SHARED@%$LIBSMBCLIENT_SHARED%g
--s%@LIBSMBCLIENT@%$LIBSMBCLIENT%g
-+s%@LIBSMBCLIENT_STATIC@%$LIBSMBCLIENT_STATIC%g
- s%@CC@%$CC%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
---- samba-2.2.2.cvs20020120.orig/source/configure.in
-+++ samba-2.2.2.cvs20020120/source/configure.in
-@@ -145,7 +145,7 @@
- AC_SUBST(SHLIBEXT)
- AC_SUBST(BLDSHARED)
- AC_SUBST(LIBSMBCLIENT_SHARED)
--AC_SUBST(LIBSMBCLIENT)
-+AC_SUBST(LIBSMBCLIENT_STATIC)
- 
- # compile with optimization and without debugging by default
- CFLAGS="-O ${CFLAGS}"
-@@ -340,6 +340,28 @@
+diff -uNr samba-3.0alpha21.orig/source/configure.in samba-3.0alpha21/source/configure.in
+--- samba-3.0alpha21.orig/source/configure.in	2003-02-16 13:01:45.000000000 -0600
++++ samba-3.0alpha21/source/configure.in	2003-02-16 13:04:03.000000000 -0600
+@@ -481,6 +481,28 @@
  #endif
  }
  ], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
@@ -6020,25 +30,3 @@
          CPPFLAGS="$old_CPPFLAGS"
          if test x$LINUX_LFS_SUPPORT = xyes ; then
            CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-@@ -2232,7 +2254,7 @@
- # should we build libsmbclient?
- 
- LIBSMBCLIENT_SHARED=
--LIBSMBCLIENT=
-+LIBSMBCLIENT_STATIC=
- AC_MSG_CHECKING(whether to build the libsmbclient shared library)
- AC_ARG_WITH(libsmbclient,
- [  --with-libsmbclient     Build the libsmbclient shared library (default=no)],
-@@ -2240,10 +2262,10 @@
-   yes)
-      if test $BLDSHARED = true; then
-         LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
--	LIBSMBCLIENT=libsmbclient
-+        LIBSMBCLIENT_STATIC=bin/libsmbclient.a
-         AC_MSG_RESULT(yes)
-      else
--        AC_MSG_RESULT(no shared library support)
-+        AC_MSG_RESULT(no static or shared libsmbclient support)
-      fi
-      ;;
-   *)
diff --git a/packaging/Debian/debian/patches/documentation.patch b/packaging/Debian/debian/patches/documentation.patch
new file mode 100644
index 0000000000..5ced2f0e4b
--- /dev/null
+++ b/packaging/Debian/debian/patches/documentation.patch
@@ -0,0 +1,106 @@
+diff -uNr samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html
+--- samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html	2000-07-30 02:38:29.000000000 -0500
++++ samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html	2002-12-16 23:15:46.000000000 -0600
+@@ -102,13 +102,13 @@
+ WARNING:</strong> You will need to use at least Samba 2.1 to ensure that PDC functionality for Windows NT clients is present. Prior to Samba 2.1, only limited user authentication for NT clients was present. At the time this book went to press, Samba 2.0.5 was the latest version, but Samba  2.1 was available through CVS download. Instructions on downloading alpha versions of Samba are given in <a href="appe_01.html"><b>Appendix E, <CITE CLASS="appendix">Downloading Samba with CVS</cite></b></a>.</p></blockquote><P CLASS="para">
+ As before, you need to ensure that Samba is a primary domain controller for the current workgroup and is using user-level security. However, you must also ensure that Samba is using encrypted passwords. In other words, alter the <CODE CLASS="literal">
+ [global]</code> options the previous example to include the <CODE CLASS="literal">
+-encrypted</code> <CODE CLASS="literal">
++encrypt</code> <CODE CLASS="literal">
+ passwords</code> <CODE CLASS="literal">
+ =</code> <CODE CLASS="literal">
+ yes</code> option, as shown here: </p><PRE CLASS="programlisting">
+ [global]
+ 	workgroup = SIMPLE
+-	encrypted passwords = yes
++	encrypt passwords = yes
+ 	domain logons = yes
+ 
+ 	security = user </pre></div><DIV CLASS="sect3">
+diff -uNr samba-2.999+3.0.alpha21.orig/docs/manpages/swat.8 samba-2.999+3.0.alpha21/docs/manpages/swat.8
+--- samba-2.999+3.0.alpha21.orig/docs/manpages/swat.8	2002-11-26 20:54:13.000000000 -0600
++++ samba-2.999+3.0.alpha21/docs/manpages/swat.8	2002-12-16 23:15:46.000000000 -0600
+@@ -42,19 +42,26 @@
+ server. \fR
+ .SH "INSTALLATION"
+ .PP
++\fBDebian-specific Note\fR: all these steps have already been done for
++you. However, by default, swat is not enabled. This has been done for
++security reasons. To enable swat you need to edit /etc/inetd.conf,
++uncomment the swat entry (usually at the end of the file), and then
++restart inetd.
++.PP
+ After you compile SWAT you need to run \fBmake install
+ \fR to install the \fBswat\fR binary
+-and the various help files and images. A default install would put 
+-these in: 
++and the various help files and images. Under \fBDebian\fR, these
++files are in (please note that these locations are different than the
++default location):
+ .TP 0.2i
+ \(bu
+-/usr/local/samba/bin/swat
++/usr/sbin/*
+ .TP 0.2i
+ \(bu
+-/usr/local/samba/swat/images/*
++/usr/share/samba/swat/images/*
+ .TP 0.2i
+ \(bu
+-/usr/local/samba/swat/help/*
++/usr/share/samba/swat/help/*
+ .SS "INETD INSTALLATION"
+ .PP
+ You need to edit your \fI/etc/inetd.conf
+@@ -62,7 +69,7 @@
+ to enable SWAT to be launched via \fBinetd\fR.
+ .PP
+ In \fI/etc/services\fR you need to 
+-add a line like this: 
++add a line like this (not needed for Debian): 
+ .PP
+ \fBswat            901/tcp\fR
+ .PP
+@@ -76,10 +83,11 @@
+ \fBinetd\fR daemon). 
+ .PP
+ In \fI/etc/inetd.conf\fR you should 
+-add a line like this: 
++add a line like this (not needed for Debian, the postinst script takes 
++care of this): 
+ .PP
+ \fBswat    stream  tcp     nowait.400  root
+-/usr/local/samba/bin/swat swat\fR
++/usr/sbin/swat swat\fR
+ .PP
+ One you have edited \fI/etc/services\fR 
+ and \fI/etc/inetd.conf\fR you need to send a 
+@@ -105,11 +113,10 @@
+ (e.g., swat) to service port (e.g., 901) and protocol type 
+ (e.g., tcp).  
+ .TP
+-\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
++\fB\fI/etc/samba/smb.conf\fB\fR
+ This is the default location of the \fIsmb.conf(5)
+-\fR server configuration file that swat edits. Other 
+-common places that systems install this file are \fI  /usr/samba/lib/smb.conf\fR and \fI/etc/smb.conf
+-\fR.  This file describes all the services the server 
++\fRserver configuration file that swat edits.
++This file describes all the services the server 
+ is to make available to clients. 
+ .SH "WARNINGS"
+ .PP
+--- samba-2.2.2.cvs20020120.orig/swat/README
++++ samba-2.2.2.cvs20020120/swat/README
+@@ -1,3 +1,11 @@
++[Debian-specific Note: you can safely skip the installation notes in
++this document. swat was configured for you when the package was
++installed. For security reasons, swat is not enabled. To enable it, you
++need to edit /etc/inetd.conf, uncomment the swat entry, and reload
++inetd. Please note that the file locations given in this file are not
++correct for the Debian version of swat. The correct file locations are
++given in swat's man page.]
++
+ This is a brief description of how to install and use the Samba Web
+ Administration Tool on your machine.
+ 
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
new file mode 100644
index 0000000000..5972b52434
--- /dev/null
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -0,0 +1,567 @@
+diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makefile.in
+--- samba-3.0alpha23.orig/source/Makefile.in	2003-03-30 20:28:28.000000000 -0600
++++ samba-3.0alpha23/source/Makefile.in	2003-04-04 21:04:05.000000000 -0600
+@@ -65,6 +65,7 @@
+ CONFIGDIR = @configdir@
+ VARDIR = @localstatedir@
+ MANDIR = @mandir@
++DATADIR = @datadir@
+ 
+ # The permissions to give the executables
+ INSTALLPERMS = 0755
+@@ -88,6 +89,13 @@
+ # the directory where lock files go
+ LOCKDIR = @lockdir@
+ 
++# FHS directories; equal to LOCKDIR if not using --with-fhs
++CACHEDIR = @cachedir@
++STATEDIR = @statedir@
++
++# Where to look for (and install) codepage databases.
++CODEPAGEDIR = @codepagedir@
++
+ # the directory where pid files go
+ PIDDIR = @piddir@
+ # man pages language(s)
+@@ -113,7 +121,7 @@
+ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
+ PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
+ 	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
+-PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
++PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -DCACHEDIR=\"$(CACHEDIR)\" -DSTATEDIR=\"$(STATEDIR)\"
+ PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
+ 
+ # Note that all executable programs now provide for an optional executable suffix.
+@@ -1146,7 +1154,7 @@
+ 	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
+ 
+ installdat: installdirs
+-	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir)
++	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(CODEPAGEDIR) $(srcdir)
+ 
+ installswat: installdirs
+ 	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
+diff -uNr samba-3.0alpha23.orig/source/configure.in samba-3.0alpha23/source/configure.in
+--- samba-3.0alpha23.orig/source/configure.in	2003-04-04 21:03:52.000000000 -0600
++++ samba-3.0alpha23/source/configure.in	2003-04-04 21:04:05.000000000 -0600
+@@ -17,18 +17,25 @@
+ AC_ARG_WITH(fhs, 
+ [  --with-fhs              Use FHS-compliant paths (default=no)],
+     configdir="${sysconfdir}/samba"
+-    lockdir="\${VARDIR}/cache/samba"
++    lockdir="\${VARDIR}/run/samba"
+     piddir="\${VARDIR}/run/samba"
+     logfilebase="\${VARDIR}/log/samba"
+     privatedir="\${CONFIGDIR}/private"
+     libdir="\${prefix}/lib/samba"
+-    swatdir="\${DATADIR}/samba/swat",
++    swatdir="\${DATADIR}/samba/swat"
++    codepagedir="\${DATADIR}/samba"
++    statedir="\${VARDIR}/lib/samba"
++    cachedir="\${VARDIR}/cache/samba"
++    AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths]),
+     configdir="\${LIBDIR}"
+     logfilebase="\${VARDIR}"
+     lockdir="\${VARDIR}/locks"
+     piddir="\${VARDIR}/locks"
+     privatedir="\${prefix}/private"
+-    swatdir="\${prefix}/swat")
++    codepagedir="\${LIBDIR}"
++    swatdir="\${prefix}/swat"
++    statedir="\${LOCKDIR}"
++    cachedir="\${LOCKDIR}")
+ 
+ #################################################
+ # set private directory location
+@@ -134,6 +141,9 @@
+ AC_SUBST(swatdir)
+ AC_SUBST(bindir)
+ AC_SUBST(sbindir)
++AC_SUBST(codepagedir)
++AC_SUBST(statedir)
++AC_SUBST(cachedir)
+ 
+ dnl Unique-to-Samba variables we'll be playing with.
+ AC_SUBST(SHELL)
+diff -uNr samba-3.0alpha23.orig/source/dynconfig.c samba-3.0alpha23/source/dynconfig.c
+--- samba-3.0alpha23.orig/source/dynconfig.c	2003-02-14 16:34:36.000000000 -0600
++++ samba-3.0alpha23/source/dynconfig.c	2003-04-04 21:04:05.000000000 -0600
+@@ -53,6 +53,13 @@
+ pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
+ 
+ /**
++ * @brief Samba data directory.
++ *
++ * @sa data_path() to get the path to a file inside the CODEPAGEDIR.
++ **/
++pstring dyn_CODEPAGEDIR = CODEPAGEDIR;
++
++/**
+  * @brief Samba library directory.
+  *
+  * @sa lib_path() to get the path to a file inside the LIBDIR.
+@@ -70,3 +77,27 @@
+ 
+ const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
+ const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
++
++
++/* In non-FHS mode, these should be configurable using 'lock dir =';
++   but in FHS mode, they are their own directory.  Implement as wrapper
++   functions so that everything can still be kept in dynconfig.c.
++ */
++
++char *dyn_STATEDIR(void)
++{
++#ifdef FHS_COMPATIBLE
++	return STATEDIR;
++#else
++	return lp_lockdir();
++#endif
++}
++
++char *dyn_CACHEDIR(void)
++{
++#ifdef FHS_COMPATIBLE
++	return CACHEDIR;
++#else
++	return lp_lockdir();
++#endif
++}
+diff -uNr samba-3.0alpha23.orig/source/groupdb/mapping.c samba-3.0alpha23/source/groupdb/mapping.c
+--- samba-3.0alpha23.orig/source/groupdb/mapping.c	2003-03-30 20:28:28.000000000 -0600
++++ samba-3.0alpha23/source/groupdb/mapping.c	2003-04-04 21:04:05.000000000 -0600
+@@ -214,7 +214,7 @@
+ 	
+ 	if (tdb && local_pid == sys_getpid())
+ 		return True;
+-	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++	tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 	if (!tdb) {
+ 		DEBUG(0,("Failed to open group mapping database\n"));
+ 		return False;
+diff -uNr samba-3.0alpha23.orig/source/include/dynconfig.h samba-3.0alpha23/source/include/dynconfig.h
+--- samba-3.0alpha23.orig/source/include/dynconfig.h	2003-02-14 16:34:36.000000000 -0600
++++ samba-3.0alpha23/source/include/dynconfig.h	2003-04-04 21:04:05.000000000 -0600
+@@ -31,8 +31,12 @@
+ extern pstring dyn_CONFIGFILE;
+ extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
+ extern pstring dyn_LIBDIR;
++extern pstring dyn_CODEPAGEDIR;
+ extern const fstring dyn_SHLIBEXT;
+ extern const pstring dyn_LOCKDIR; 
+ extern const pstring dyn_PIDDIR;
+ extern const pstring dyn_SMB_PASSWD_FILE;
+ extern const pstring dyn_PRIVATE_DIR;
++
++char *dyn_STATEDIR();
++char *dyn_CACHEDIR();
+diff -uNr samba-3.0alpha23.orig/source/intl/lang_tdb.c samba-3.0alpha23/source/intl/lang_tdb.c
+--- samba-3.0alpha23.orig/source/intl/lang_tdb.c	2003-01-03 08:41:24.000000000 -0600
++++ samba-3.0alpha23/source/intl/lang_tdb.c	2003-04-04 21:04:05.000000000 -0600
+@@ -123,7 +123,7 @@
+ 	/* if no lang then we don't translate */
+ 	if (!lang) return True;
+ 
+-	asprintf(&msg_path, "%s.msg", lib_path((const char *)lang));
++	asprintf(&msg_path, "%s.msg", data_path((const char *)lang));
+ 	if (stat(msg_path, &st) != 0) {
+ 		/* the msg file isn't available */
+ 		free(msg_path);
+@@ -131,7 +131,7 @@
+ 	}
+ 	
+ 
+-	asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang);
++	asprintf(&path, "%s%s.tdb", state_path("lang_"), lang);
+ 
+ 	tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644);
+ 	if (!tdb) {
+diff -uNr samba-3.0alpha23.orig/source/lib/account_pol.c samba-3.0alpha23/source/lib/account_pol.c
+--- samba-3.0alpha23.orig/source/lib/account_pol.c	2003-01-03 08:41:24.000000000 -0600
++++ samba-3.0alpha23/source/lib/account_pol.c	2003-04-04 21:04:06.000000000 -0600
+@@ -36,7 +36,7 @@
+ 
+ 	if (tdb && local_pid == sys_getpid())
+ 		return True;
+-	tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++	tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 	if (!tdb) {
+ 		DEBUG(0,("Failed to open account policy database\n"));
+ 		return False;
+diff -uNr samba-3.0alpha23.orig/source/lib/util.c samba-3.0alpha23/source/lib/util.c
+--- samba-3.0alpha23.orig/source/lib/util.c	2003-03-30 20:28:28.000000000 -0600
++++ samba-3.0alpha23/source/lib/util.c	2003-04-04 21:04:06.000000000 -0600
+@@ -2228,6 +2228,61 @@
+ }
+ 
+ /**
++ * @brief Returns an absolute path to a file in the Samba data directory.
++ *
++ * @param name File to find, relative to CODEPAGEDIR.
++ *
++ * @retval Pointer to a static #pstring containing the full path.
++ **/
++
++char *data_path(const char *name)
++{
++	static pstring fname;
++	snprintf(fname, sizeof(fname), "%s/%s", dyn_CODEPAGEDIR, name);
++	return fname;
++}
++
++/*****************************************************************
++a useful function for returning a path in the Samba state directory
++ *****************************************************************/
++char *state_path(char *name)
++{
++	static pstring fname;
++
++	pstrcpy(fname,dyn_STATEDIR());
++	trim_string(fname,"","/");
++
++	if (!directory_exist(fname,NULL)) {
++		mkdir(fname,0755);
++	}
++
++	pstrcat(fname,"/");
++	pstrcat(fname,name);
++
++	return fname;
++}
++
++/*****************************************************************
++a useful function for returning a path in the Samba cache directory
++ *****************************************************************/
++char *cache_path(char *name)
++{
++	static pstring fname;
++
++	pstrcpy(fname,dyn_CACHEDIR());
++	trim_string(fname,"","/");
++
++	if (!directory_exist(fname,NULL)) {
++			mkdir(fname,0755);
++	}
++
++	pstrcat(fname,"/");
++	pstrcat(fname,name);
++
++	return fname;
++}
++
++/**
+  * @brief Returns the platform specific shared library extension.
+  *
+  * @retval Pointer to a static #fstring containing the extension.
+diff -uNr samba-3.0alpha23.orig/source/lib/util_unistr.c samba-3.0alpha23/source/lib/util_unistr.c
+--- samba-3.0alpha23.orig/source/lib/util_unistr.c	2003-02-27 09:22:58.000000000 -0600
++++ samba-3.0alpha23/source/lib/util_unistr.c	2003-04-04 21:04:06.000000000 -0600
+@@ -54,8 +54,8 @@
+ 	if (initialised) return;
+ 	initialised = 1;
+ 
+-	upcase_table = map_file(lib_path("upcase.dat"), 0x20000);
+-	lowcase_table = map_file(lib_path("lowcase.dat"), 0x20000);
++	upcase_table = map_file(data_path("upcase.dat"), 0x20000);
++	lowcase_table = map_file(data_path("lowcase.dat"), 0x20000);
+ 
+ 	/* we would like Samba to limp along even if these tables are
+ 	   not available */
+@@ -161,7 +161,7 @@
+ 		return;
+ 	}
+ 
+-	valid_file = map_file(lib_path("valid.dat"), 0x10000);
++	valid_file = map_file(data_path("valid.dat"), 0x10000);
+ 	if (valid_file) {
+ 		valid_table = valid_file;
+ 		mapped_file = 1;
+diff -uNr samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c samba-3.0alpha23/source/libsmb/netlogon_unigrp.c
+--- samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c	2003-01-02 10:22:58.000000000 -0600
++++ samba-3.0alpha23/source/libsmb/netlogon_unigrp.c	2003-04-04 21:04:06.000000000 -0600
+@@ -41,7 +41,7 @@
+ BOOL uni_group_cache_init(void)
+ {
+ 	if (!netlogon_unigrp_tdb) {
+-		netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0,
++		netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0,
+ 						   TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
+ 	}
+ 
+@@ -119,7 +119,7 @@
+ 		return NULL;
+ 	}
+ 	if (!netlogon_unigrp_tdb) {
+-		netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0,
++		netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0,
+                 				    TDB_DEFAULT, O_RDWR, 0644);
+ 	}
+ 	if (!netlogon_unigrp_tdb) {
+diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c	2002-12-12 09:07:32.000000000 -0600
++++ samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c	2003-04-04 21:04:06.000000000 -0600
+@@ -343,7 +343,7 @@
+ 
+   updatecount++;
+     
+-  pstrcpy(fname,lp_lockdir());
++  pstrcpy(fname,dyn_CACHEDIR());
+   trim_string(fname,NULL,"/");
+   pstrcat(fname,"/");
+   pstrcat(fname,SERVER_LIST);
+diff -uNr samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c samba-3.0alpha23/source/nsswitch/winbindd_cache.c
+--- samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c	2002-10-16 12:52:31.000000000 -0500
++++ samba-3.0alpha23/source/nsswitch/winbindd_cache.c	2003-04-04 21:04:06.000000000 -0600
+@@ -53,7 +53,7 @@
+ 	}
+ 	if (opt_nocache) return;
+ 
+-	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, 
++	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, 
+ 				   TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
+ 
+ 	if (!wcache->tdb) {
+diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/param/loadparm.c
+--- samba-3.0alpha23.orig/source/param/loadparm.c	2003-03-30 20:28:29.000000000 -0600
++++ samba-3.0alpha23/source/param/loadparm.c	2003-04-04 21:04:06.000000000 -0600
+@@ -104,6 +104,9 @@
+ 	char *szAddPrinterCommand;
+ 	char *szDeletePrinterCommand;
+ 	char *szOs2DriverMap;
++#ifdef FHS_COMPATIBLE
++	char *szLockDirStub;
++#endif
+ 	char *szLockDir;
+ 	char *szPidDir;
+ 	char *szRootdir;
+@@ -1053,8 +1056,13 @@
+ 	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
+ 	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+ 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
++#ifdef FHS_COMPATIBLE
++	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
++	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
++#else
+ 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
+ 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
++#endif
+ 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
+ #ifdef WITH_UTMP
+ 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+diff -uNr samba-3.0alpha23.orig/source/passdb/secrets.c samba-3.0alpha23/source/passdb/secrets.c
+--- samba-3.0alpha23.orig/source/passdb/secrets.c	2003-03-30 20:28:29.000000000 -0600
++++ samba-3.0alpha23/source/passdb/secrets.c	2003-04-04 21:04:06.000000000 -0600
+@@ -37,8 +37,7 @@
+ 	if (tdb)
+ 		return True;
+ 
+-	pstrcpy(fname, lp_private_dir());
+-	pstrcat(fname,"/secrets.tdb");
++	pstrcpy(fname, state_path("secrets.tdb"));
+ 
+ 	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 
+diff -uNr samba-3.0alpha23.orig/source/printing/nt_printing.c samba-3.0alpha23/source/printing/nt_printing.c
+--- samba-3.0alpha23.orig/source/printing/nt_printing.c	2003-03-30 20:28:29.000000000 -0600
++++ samba-3.0alpha23/source/printing/nt_printing.c	2003-04-04 21:04:07.000000000 -0600
+@@ -271,28 +271,28 @@
+  
+ 	if (tdb_drivers)
+ 		tdb_close(tdb_drivers);
+-	tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++	tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 	if (!tdb_drivers) {
+ 		DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
+-			lock_path("ntdrivers.tdb"), strerror(errno) ));
++			state_path("ntdrivers.tdb"), strerror(errno) ));
+ 		return False;
+ 	}
+  
+ 	if (tdb_printers)
+ 		tdb_close(tdb_printers);
+-	tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++	tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 	if (!tdb_printers) {
+ 		DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
+-			lock_path("ntprinters.tdb"), strerror(errno) ));
++			state_path("ntprinters.tdb"), strerror(errno) ));
+ 		return False;
+ 	}
+  
+ 	if (tdb_forms)
+ 		tdb_close(tdb_forms);
+-	tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++	tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 	if (!tdb_forms) {
+ 		DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
+-			lock_path("ntforms.tdb"), strerror(errno) ));
++			state_path("ntforms.tdb"), strerror(errno) ));
+ 		return False;
+ 	}
+  
+diff -uNr samba-3.0alpha23.orig/source/printing/printing.c samba-3.0alpha23/source/printing/printing.c
+--- samba-3.0alpha23.orig/source/printing/printing.c	2003-03-30 20:28:29.000000000 -0600
++++ samba-3.0alpha23/source/printing/printing.c	2003-04-04 21:04:08.000000000 -0600
+@@ -174,8 +174,8 @@
+ 	if (local_pid == sys_getpid())
+ 		return True;
+ 
+-	unlink(lock_path("printing.tdb"));
+-	pstrcpy(printing_path,lock_path("printing"));
++	unlink(cache_path("printing.tdb"));
++	pstrcpy(printing_path,cache_path("printing"));
+ 	mkdir(printing_path,0755);
+ 
+ 	local_pid = sys_getpid();
+diff -uNr samba-3.0alpha23.orig/source/printing/printing_db.c samba-3.0alpha23/source/printing/printing_db.c
+--- samba-3.0alpha23.orig/source/printing/printing_db.c	2003-02-14 16:34:37.000000000 -0600
++++ samba-3.0alpha23/source/printing/printing_db.c	2003-04-04 21:04:08.000000000 -0600
+@@ -86,7 +86,7 @@
+ 		DLIST_ADD(print_db_head, p);
+ 	}
+ 
+-	pstrcpy(printdb_path, lock_path("printing/"));
++	pstrcpy(printdb_path, cache_path("printing/"));
+ 	pstrcat(printdb_path, printername);
+ 	pstrcat(printdb_path, ".tdb");
+ 
+diff -uNr samba-3.0alpha23.orig/source/registry/reg_db.c samba-3.0alpha23/source/registry/reg_db.c
+--- samba-3.0alpha23.orig/source/registry/reg_db.c	2002-08-26 09:46:07.000000000 -0500
++++ samba-3.0alpha23/source/registry/reg_db.c	2003-04-04 21:04:08.000000000 -0600
+@@ -131,13 +131,13 @@
+ 	 * if we need to init the data in the registry
+ 	 */
+ 	
+-	tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
++	tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+ 	if ( !tdb_reg ) 
+ 	{
+-		tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++		tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 		if ( !tdb_reg ) {
+ 			DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
+-				lock_path("registry.tdb"), strerror(errno) ));
++				state_path("registry.tdb"), strerror(errno) ));
+ 			return False;
+ 		}
+ 		
+diff -uNr samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0alpha23/source/rpc_server/srv_srvsvc_nt.c
+--- samba-3.0alpha23.orig/source/rpc_server/srv_srvsvc_nt.c	2003-03-30 20:28:31.000000000 -0600
++++ samba-3.0alpha23/source/rpc_server/srv_srvsvc_nt.c	2003-04-04 21:04:08.000000000 -0600
+@@ -133,10 +133,10 @@
+  
+ 	if (share_tdb && local_pid == sys_getpid())
+ 		return True;
+-	share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++	share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ 	if (!share_tdb) {
+ 		DEBUG(0,("Failed to open share info database %s (%s)\n",
+-			lock_path("share_info.tdb"), strerror(errno) ));
++			state_path("share_info.tdb"), strerror(errno) ));
+ 		return False;
+ 	}
+  
+diff -uNr samba-3.0alpha23.orig/source/smbd/lanman.c samba-3.0alpha23/source/smbd/lanman.c
+--- samba-3.0alpha23.orig/source/smbd/lanman.c	2003-02-25 14:51:35.000000000 -0600
++++ samba-3.0alpha23/source/smbd/lanman.c	2003-04-04 21:04:08.000000000 -0600
+@@ -966,9 +966,9 @@
+   BOOL local_list_only;
+   int i;
+ 
+-  lines = file_lines_load(lock_path(SERVER_LIST), NULL);
++  lines = file_lines_load(cache_path(SERVER_LIST), NULL);
+   if (!lines) {
+-    DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
++    DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
+     return(0);
+   }
+ 
+diff -uNr samba-3.0alpha23.orig/source/wrepld/process.c samba-3.0alpha23/source/wrepld/process.c
+--- samba-3.0alpha23.orig/source/wrepld/process.c	2003-01-14 10:01:01.000000000 -0600
++++ samba-3.0alpha23/source/wrepld/process.c	2003-04-04 21:04:09.000000000 -0600
+@@ -197,7 +197,7 @@
+ {
+ 	TDB_CONTEXT *tdb;
+ 
+-	tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
++	tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
+ 	if (!tdb) {
+ 		DEBUG(2,("get_our_last_id: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
+ 		return;
+@@ -489,7 +489,7 @@
+ 		}
+ 
+ 
+-	tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
++	tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
+ 	if (!tdb) {
+ 		DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
+ 		return;
+diff -uNr samba-3.0alpha23.orig/source/passdb/pdb_tdb.c samba-3.0alpha23/source/passdb/pdb_tdb.c
+--- samba-3.0alpha23.orig/source/passdb/pdb_tdb.c	2003-03-30 20:28:29.000000000 -0600
++++ samba-3.0alpha23/source/passdb/pdb_tdb.c	2003-04-30 13:51:43.000000000 -0500
+@@ -943,10 +943,7 @@
+ 	if (location) {
+ 		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
+ 	} else {
+-		pstring tdbfile;
+-		get_private_directory(tdbfile);
+-		pstrcat(tdbfile, "/");
+-		pstrcat(tdbfile, PASSDB_FILE_NAME);
++		char *tdbfile = state_path(PASSDB_FILE_NAME);
+ 		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
+ 	}
+ 
+--- samba-3.0alpha24/source/nmbd/nmbd_winsserver.c.orig	2003-05-18 19:12:27.000000000 -0400
++++ samba-3.0alpha24/source/nmbd/nmbd_winsserver.c	2003-05-18 19:18:04.000000000 -0400
+@@ -230,7 +230,7 @@
+ 
+   add_samba_names_to_subnet(wins_server_subnet);
+ 
+-  if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL)
++  if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL)
+   {
+     DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
+            WINS_LIST, strerror(errno) ));
+@@ -1836,7 +1836,7 @@
+ 	  }
+   }
+ 
+-  slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
++  slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
+   all_string_sub(fname,"//", "/", 0);
+   slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
+ 
+--- samba-3.0alpha24/source/nsswitch/winbindd_idmap_tdb.c.orig	2003-05-18 19:22:14.000000000 -0400
++++ samba-3.0alpha24/source/nsswitch/winbindd_idmap_tdb.c	2003-05-18 19:27:14.000000000 -0400
+@@ -283,16 +283,16 @@
+ 	SMB_STRUCT_STAT stbuf;
+ 
+ 	/* move to the new database on first startup */
+-	if (!file_exist(lock_path("idmap.tdb"), &stbuf)) {
+-		if (file_exist(lock_path("winbindd_idmap.tdb"), &stbuf)) {
++	if (!file_exist(state_path("idmap.tdb"), &stbuf)) {
++		if (file_exist(state_path("winbindd_idmap.tdb"), &stbuf)) {
+ 			char *cmd = NULL;
+ 			
+ 			/* lazy file copy */
+-			if (asprintf(&cmd, "cp -p %s/winbindd_idmap.tdb %s/idmap.tdb", lp_lockdir(), lp_lockdir()) != -1) {
++			if (asprintf(&cmd, "cp -p %s/winbindd_idmap.tdb %s/idmap.tdb", dyn_STATEDIR(), dyn_STATEDIR()) != -1) {
+ 				system(cmd);
+ 				free(cmd);
+ 			}
+-			if (!file_exist(lock_path("idmap.tdb"), &stbuf)) {
++			if (!file_exist(state_path("idmap.tdb"), &stbuf)) {
+ 				DEBUG(0, ("idmap_init: Unable to make a new database copy\n"));
+ 				return False;
+ 			}
+@@ -300,7 +300,7 @@
+ 	}
+ 
+ 	/* Open tdb cache */
+-	if (!(idmap_tdb = tdb_open_log(lock_path("idmap.tdb"), 0,
++	if (!(idmap_tdb = tdb_open_log(state_path("idmap.tdb"), 0,
+ 				       TDB_DEFAULT, O_RDWR | O_CREAT,
+ 				       0600))) {
+ 		DEBUG(0,
diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch
new file mode 100644
index 0000000000..ff5f23a1cf
--- /dev/null
+++ b/packaging/Debian/debian/patches/installswat.sh.patch
@@ -0,0 +1,84 @@
+--- samba-3.0alpha23.orig/source/script/installswat.sh	2001-10-17 16:00:14.000000000 -0400
++++ samba-3.0alpha23/source/script/installswat.sh	2003-04-06 03:18:29.000000000 -0400
+@@ -9,7 +9,7 @@
+ echo Installing the Samba Web Administration Tool
+ 
+ LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
+-echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
++echo Installing the following additional langs: `cd $SRCDIR../swat/lang/; /bin/echo ??`
+ 
+ for ln in $LANGS; do 
+  SWATLANGDIR=$SWATDIR/$ln
+@@ -23,21 +23,17 @@
+ 	fi
+     fi
+  done
+-done
+-
+-# Install images
+-for ln in $LANGS; do
+ 
+-for f in $SRCDIR../swat/$ln/images/*.gif; do
++ # Install images
++ for f in $SRCDIR../swat/$ln/images/*.gif; do
+       FNAME=$SWATDIR/$ln/images/`basename $f`
+       echo $FNAME
+       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+       chmod 0644 $FNAME
+-done
+-
+-# Install html help
++ done
+ 
+-for f in $SRCDIR../swat/$ln/help/*.html; do
++ # Install html help
++ for f in $SRCDIR../swat/$ln/help/*.html; do
+       FNAME=$SWATDIR/$ln/help/`basename $f`
+       echo $FNAME
+       if [ "x$BOOKDIR" = "x" ]; then
+@@ -49,31 +45,31 @@
+       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+       rm -f $f
+       chmod 0644 $FNAME
+-done
+-
+-# Install html documentation
+-
+-for f in $SRCDIR../docs/htmldocs/*.html; do
+-      FNAME=$SWATDIR/help/`basename $f`
+-      echo $FNAME
+-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+-      chmod 0644 $FNAME
+-done
+-
+-# Install "server-side" includes
++ done
+ 
+-for f in $SRCDIR../swat/$ln/include/*.html; do
++ # Install "server-side" includes
++ for f in $SRCDIR../swat/$ln/include/*.html; do
+       FNAME=$SWATDIR/$ln/include/`basename $f`
+       echo $FNAME
+       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+       chmod 0644 $FNAME
++ done
+ done
+ 
++# Install html documentation
++for f in $SRCDIR../docs/htmldocs/*.html; do
++      FNAME=$SWATDIR/help/`basename $f`
++      echo $FNAME
++      ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
++#      chmod 0644 $FNAME
+ done
+ 
+ # Install Using Samba book
+ 
+-if [ "x$BOOKDIR" != "x" ]; then
++# For Debian we do not install anything here, we just create a symlink
++#	pointing to /usr/share/doc/samba-doc/htmldocs/using_samba/ in
++#	debian/rules (peloy@debian.org)
++if /bin/false; then
+ 
+     # Create directories
+ 
diff --git a/packaging/Debian/debian/patches/loadparm.patch b/packaging/Debian/debian/patches/loadparm.patch
deleted file mode 100644
index d7880a2514..0000000000
--- a/packaging/Debian/debian/patches/loadparm.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- samba-2.2.2.cvs20020201/source/param/loadparm.c.orig	Fri Feb  1 17:03:50 2002
-+++ samba-2.2.2.cvs20020201/source/param/loadparm.c	Fri Feb  1 18:45:41 2002
-@@ -1085,26 +1085,26 @@
- 		case PRINT_AIX:
- 		case PRINT_LPRNT:
- 		case PRINT_LPROS2:
--			string_set(&sDefault.szLpqcommand, "lpq -P%p");
--			string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
-+			string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
-+			string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
- 			string_set(&sDefault.szPrintcommand,
--				   "lpr -r -P%p %s");
-+				   "lpr -r -P'%p' %s");
- 			break;
- 
- 		case PRINT_LPRNG:
- 		case PRINT_PLP:
--			string_set(&sDefault.szLpqcommand, "lpq -P%p");
--			string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
-+			string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
-+			string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
- 			string_set(&sDefault.szPrintcommand,
--				   "lpr -r -P%p %s");
-+				   "lpr -r -P'%p' %s");
- 			string_set(&sDefault.szQueuepausecommand,
--				   "lpc stop %p");
-+				   "lpc stop '%p'");
- 			string_set(&sDefault.szQueueresumecommand,
--				   "lpc start %p");
-+				   "lpc start '%p'");
- 			string_set(&sDefault.szLppausecommand,
--				   "lpc hold %p %j");
-+				   "lpc hold '%p' %j");
- 			string_set(&sDefault.szLpresumecommand,
--				   "lpc release %p %j");
-+				   "lpc release '%p' %j");
- 			break;
- 
- 		case PRINT_CUPS:
-@@ -1120,19 +1120,19 @@
- 			string_set(&Globals.szPrintcapname, "cups");
- #else
- 			string_set(&sDefault.szLpqcommand,
--			           "/usr/bin/lpstat -o %p");
-+			           "/usr/bin/lpstat -o '%p'");
- 			string_set(&sDefault.szLprmcommand,
--			           "/usr/bin/cancel %p-%j");
-+			           "/usr/bin/cancel '%p-%j'");
- 			string_set(&sDefault.szPrintcommand,
--			           "/usr/bin/lp -d %p %s; rm %s");
-+			           "/usr/bin/lp -d '%p' %s; rm %s");
- 			string_set(&sDefault.szLppausecommand,
--				   "lp -i %p-%j -H hold");
-+				   "lp -i '%p-%j' -H hold");
- 			string_set(&sDefault.szLpresumecommand,
--				   "lp -i %p-%j -H resume");
-+				   "lp -i '%p-%j' -H resume");
- 			string_set(&sDefault.szQueuepausecommand,
--			           "/usr/bin/disable %p");
-+			           "/usr/bin/disable '%p'");
- 			string_set(&sDefault.szQueueresumecommand,
--			           "/usr/bin/enable %p");
-+			           "/usr/bin/enable '%p'");
- 			string_set(&Globals.szPrintcapname, "lpstat");
- #endif /* HAVE_CUPS */
- 			break;
-@@ -1437,7 +1437,10 @@
- 	else
- 		StrnCpy(ret, s, len);
- 
--	trim_string(ret, "\"", "\"");
-+	if (trim_string(ret, "\"", "\"")) {
-+		if (strchr(ret,'"') != NULL)
-+			StrnCpy(ret, s, len);
-+	}
- 
- 	standard_sub_basic(ret);
- 	return (ret);
diff --git a/packaging/Debian/debian/patches/nmbd-signalling.patch b/packaging/Debian/debian/patches/nmbd-signalling.patch
new file mode 100644
index 0000000000..c34f7e75fb
--- /dev/null
+++ b/packaging/Debian/debian/patches/nmbd-signalling.patch
@@ -0,0 +1,20 @@
+diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c
+--- samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c	2002-11-26 20:54:19.000000000 -0600
++++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c	2002-12-16 23:34:13.000000000 -0600
+@@ -230,12 +230,16 @@
+   extern struct in_addr loopback_ip;
+ 
+   if(num_interfaces == 0) {
++	  void (*old_handler)(int);
++
+ 	  DEBUG(0,("create_subnets: No local interfaces !\n"));
+ 	  DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
++	  old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+ 	  while (iface_count() == 0) {
+ 		  sleep(5);
+ 		  load_interfaces();
+ 	  }
++	  CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
+   }
+ 
+   num_interfaces = iface_count();
diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch
index be251861cb..60968aae36 100644
--- a/packaging/Debian/debian/patches/samba.patch
+++ b/packaging/Debian/debian/patches/samba.patch
@@ -1,15 +1,16 @@
---- samba-2.2.2.cvs20020120.orig/source/client/smbmount.c
-+++ samba-2.2.2.cvs20020120/source/client/smbmount.c
-@@ -719,7 +719,7 @@
+diff -uNr samba-3.0alpha23.orig/source/client/smbmount.c samba-3.0alpha23/source/client/smbmount.c
+--- samba-3.0alpha23.orig/source/client/smbmount.c	2003-03-30 20:28:28.000000000 -0600
++++ samba-3.0alpha23/source/client/smbmount.c	2003-04-04 21:05:58.000000000 -0600
+@@ -765,7 +765,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
  					got_pass = True;
--					memset(strchr(opteq+1,'%')+1,'X',strlen(password));
-+					memset(strchr(opteq+1,'%')+1,'\0',strlen(password));
+-					memset(strchr_m(opteq+1,'%')+1,'X',strlen(password));
++					memset(strchr_m(opteq+1,'%')+1,'\0',strlen(password));
  				}
- 				if ((lp=strchr(username,'/'))) {
+ 				if ((lp=strchr_m(username,'/'))) {
  					*lp = 0;
-@@ -729,7 +729,7 @@
+@@ -775,7 +775,7 @@
  				  !strcmp(opts, "password")) {
  				pstrcpy(password,opteq+1);
  				got_pass = True;
@@ -18,27 +19,19 @@
  			} else if(!strcmp(opts, "credentials")) {
  				pstrcpy(credentials,opteq+1);
  			} else if(!strcmp(opts, "netbiosname")) {
-@@ -822,7 +822,7 @@
+@@ -889,7 +889,7 @@
  			*p = 0;
  			pstrcpy(password,p+1);
  			got_pass = True;
--			memset(strchr(getenv("USER"),'%')+1,'X',strlen(password));
-+			memset(strchr(getenv("USER"),'%')+1,'\0',strlen(password));
+-			memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
++			memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password));
  		}
  		strupper(username);
  	}
---- samba-2.2.2.cvs20020120.orig/source/script/installbin.sh
-+++ samba-2.2.2.cvs20020120/source/script/installbin.sh
-@@ -11,7 +11,7 @@
- shift
- shift
- 
--for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do
-+for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do
- if [ ! -d $d ]; then
- mkdir $d
- if [ ! -d $d ]; then
-@@ -33,9 +33,11 @@
+diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/source/script/installbin.sh
+--- samba-3.0alpha23.orig/source/script/installbin.sh	2002-04-22 13:16:20.000000000 -0500
++++ samba-3.0alpha23/source/script/installbin.sh	2003-04-04 21:05:58.000000000 -0600
+@@ -22,9 +22,11 @@
   chmod $INSTALLPERMS $BINDIR/$p2
  
   # this is a special case, mount needs this in a specific location
@@ -53,34 +46,40 @@
  done
  
  
---- samba-2.2.2.cvs20020120.orig/source/script/installswat.sh
-+++ samba-2.2.2.cvs20020120/source/script/installswat.sh
-@@ -48,8 +48,8 @@
- for f in $SRCDIR../docs/htmldocs/*.html; do
-       FNAME=$SWATDIR/help/`basename $f`
-       echo $FNAME
--      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
--      chmod 0644 $FNAME
-+      ln -s ../../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-+#      chmod 0644 $FNAME
- done
- 
- # Install "server-side" includes
-@@ -63,7 +63,10 @@
- 
- # Install Using Samba book
- 
--if [ "x$BOOKDIR" != "x" ]; then
-+# For Debian we do not install anything here, we just create a symlink
-+#	pointing to /usr/share/doc/samba-doc/htmldocs/using_samba/ in
-+#	debian/rules (peloy@debian.org)
-+if /bin/false; then
- 
-     # Create directories
+diff -uNr samba-3.0alpha23.orig/source/smbd/service.c samba-3.0alpha23/source/smbd/service.c
+--- samba-3.0alpha23.orig/source/smbd/service.c	2003-03-30 20:28:31.000000000 -0600
++++ samba-3.0alpha23/source/smbd/service.c	2003-04-04 21:05:58.000000000 -0600
+@@ -895,6 +895,14 @@
+ 		change_to_root_user();
+ 	}
  
---- samba-2.2.2.cvs20020120.orig/source/web/diagnose.c
-+++ samba-2.2.2.cvs20020120/source/web/diagnose.c
-@@ -54,6 +54,7 @@
++	/* If our root postexec command includes a call to 'unmount', we want
++	   to make sure we aren't blocking the mount point. */
++	/* I think this patch should go here, but I am not sure since
++	   the code looks very different than in Samba 2.2.2. Will come
++	   back later; should check what change_to_root_user() does. Eloy.-
++	vfs_ChDir(conn,"/");
++	/*
++
+ 	change_to_root_user();
+ 	/* execute any "root postexec = " line */
+ 	if (*lp_rootpostexec(SNUM(conn)))  {
+diff -uNr samba-3.0alpha23.orig/source/smbwrapper/smbsh.c samba-3.0alpha23/source/smbwrapper/smbsh.c
+--- samba-3.0alpha23.orig/source/smbwrapper/smbsh.c	2003-03-30 20:28:31.000000000 -0600
++++ samba-3.0alpha23/source/smbwrapper/smbsh.c	2003-04-04 21:05:58.000000000 -0600
+@@ -36,7 +36,7 @@
+ int main(int argc, char *argv[])
+ {
+ 	char *p, *u;
+-	const char *libd = dyn_BINDIR;
++	const char *libd = dyn_LIBDIR;
+ 	pstring line, wd;
+ 	int opt;
+ 	extern char *optarg;
+diff -uNr samba-3.0alpha23.orig/source/web/diagnose.c samba-3.0alpha23/source/web/diagnose.c
+--- samba-3.0alpha23.orig/source/web/diagnose.c	2003-01-18 13:03:58.000000000 -0600
++++ samba-3.0alpha23/source/web/diagnose.c	2003-04-04 21:05:58.000000000 -0600
+@@ -70,6 +70,7 @@
  	static struct cli_state cli;
  	extern struct in_addr loopback_ip;
  
@@ -88,112 +87,3 @@
  	if (!cli_initialise(&cli))
  		return False;
  
---- samba-2.2.2.cvs20020120.orig/source/web/startstop.c
-+++ samba-2.2.2.cvs20020120/source/web/startstop.c
-@@ -37,7 +37,7 @@
- 		return;
- 	}
- 
--	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", SBINDIR);
-+	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", "/usr/sbin");
- 
- 	become_daemon();
- 
-@@ -58,7 +58,7 @@
- 		return;
- 	}
- 
--	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", SBINDIR);
-+	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", "/usr/sbin");
- 	
- 	become_daemon();
- 
---- samba-2.2.2.cvs20020120.orig/source/web/swat.c
-+++ samba-2.2.2.cvs20020120/source/web/swat.c
-@@ -49,6 +49,19 @@
- #define ENABLE_USER_FLAG "enable_user_flag"
- #define RHOST "remote_host"
- 
-+typedef struct html_conversion {
-+	char src;
-+	char *dest;
-+} html_conversion;
-+
-+static const html_conversion entities[] = {
-+	{ '"', "&quot;"	},
-+	{ '&', "&amp;"	},
-+	{ '<', "&lt;"	},
-+	{ '>', "&gt;"	},
-+	{ '\0', NULL },
-+};
-+
- /* we need these because we link to locking*.o */
-  void become_root(void) {}
-  void unbecome_root(void) {}
-@@ -77,6 +90,51 @@
- 	return newstring;
- }
- 
-+static char *htmlentities(char *str)
-+{
-+	int i,j, destlen = 0;
-+	int length = strlen(str);
-+	/* Feel free to use a pstring if appropriate -- I haven't 
-+	   checked if it's guaranteed to be long enough, and suspect it 
-+	   isn't. -SRL */
-+	char *dststr = NULL;
-+	char *p;
-+
-+	for (i = 0; i < length; i++) {
-+		for (j = 0; entities[j].src; j++) {
-+			if (str[i] == entities[j].src) {
-+				destlen += strlen(entities[j].dest);
-+				break;
-+			}
-+		}
-+		if (!entities[j].src) {
-+			destlen++;
-+		}
-+	}
-+	if (length == destlen) {
-+		return(strdup(str));
-+	}
-+	p = dststr = malloc(destlen + 1);
-+	if (!dststr) {
-+		return(NULL);
-+	}
-+	dststr[destlen] = '\0';
-+	for (i = 0; i < length; i++) {
-+		for (j = 0; entities[j].src; j++) {
-+			if (str[i] == entities[j].src) {
-+				strncpy(p, entities[j].dest,
-+				        strlen(entities[j].dest));
-+				p += strlen(entities[j].dest);
-+				break;
-+			}
-+		}
-+		if (!entities[j].src) {
-+			*p++ = str[i];
-+		}
-+	}
-+	return(dststr);
-+}
-+
- static char *stripspace(char *str)
- {
- static char newstring[1024];
-@@ -182,8 +240,12 @@
- 
- 	case P_STRING:
- 	case P_USTRING:
--		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
--		       make_parm_name(parm->label), *(char **)ptr);
-+		str = htmlentities(*(char **)ptr);
-+		printf("<input type=\"text\" size=\"40\" name=\"parm_%s\" value=\"%s\">",
-+		       make_parm_name(parm->label), str);
-+		if (str != NULL) {
-+			free(str);
-+		}
- 		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
- 			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
- 		break;
diff --git a/packaging/Debian/debian/patches/smbadduser.patch b/packaging/Debian/debian/patches/smbadduser.patch
index 9bfb457301..36b74b3175 100644
--- a/packaging/Debian/debian/patches/smbadduser.patch
+++ b/packaging/Debian/debian/patches/smbadduser.patch
@@ -1,5 +1,6 @@
---- samba-2.2.2.cvs20020120.orig/source/script/smbadduser
-+++ samba-2.2.2.cvs20020120/source/script/smbadduser
+diff -uNr samba-3.0alpha21.orig/source/smbadduser samba-3.0alpha21/source/smbadduser
+--- samba-3.0alpha21.orig/source/smbadduser	2003-02-16 13:01:45.000000000 -0600
++++ samba-3.0alpha21/source/smbadduser	2003-02-16 16:25:16.000000000 -0600
 @@ -2,13 +2,14 @@
  #
  # smbadduser - Written by Mike Zakharoff
@@ -12,9 +13,9 @@
 +#set path = ($path /usr/local/samba/bin)
  
 -set smbpasswd = /usr/local/samba/private/smbpasswd
--#set smbpasswd = /etc/samba.d/smbpasswd
+-#set smbpasswd = /etc/samba/smbpasswd
 -set user_map  = /usr/local/samba/lib/users.map
--#set user_map  = /etc/samba.d/smbusers
+-#set user_map  = /etc/samba/smbusers
 +set smbpasswd = /etc/samba/smbpasswd
 +set user_map  = /etc/samba/users.map
  #
diff --git a/packaging/Debian/debian/patches/smbclient-pager.patch b/packaging/Debian/debian/patches/smbclient-pager.patch
index d600c1bd9c..3ee85d4118 100644
--- a/packaging/Debian/debian/patches/smbclient-pager.patch
+++ b/packaging/Debian/debian/patches/smbclient-pager.patch
@@ -1,6 +1,7 @@
---- samba-2.2.2.cvs20020120.orig/source/include/local.h
-+++ samba-2.2.2.cvs20020120/source/include/local.h
-@@ -105,7 +105,7 @@
+diff -uNr samba-2.999+3.0cvs20020906.orig/source/include/local.h samba-2.999+3.0cvs20020906/source/include/local.h
+--- samba-2.999+3.0cvs20020906.orig/source/include/local.h	2002-09-04 14:13:06.000000000 -0500
++++ samba-2.999+3.0cvs20020906/source/include/local.h	2002-09-08 14:19:24.000000000 -0500
+@@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */
  #ifndef PAGER
diff --git a/packaging/Debian/debian/patches/smbclient-xfer-speed.patch b/packaging/Debian/debian/patches/smbclient-xfer-speed.patch
deleted file mode 100644
index 3ff8b60069..0000000000
--- a/packaging/Debian/debian/patches/smbclient-xfer-speed.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- samba-2.2.2.cvs20020120/source/client/client.c.orig	Wed Jan 23 23:32:44 2002
-+++ samba-2.2.2.cvs20020120/source/client/client.c	Wed Jan 23 23:33:50 2002
-@@ -92,10 +92,10 @@
- extern file_info def_finfo;
- 
- /* timing globals */
--int get_total_size = 0;
--int get_total_time_ms = 0;
--int put_total_size = 0;
--int put_total_time_ms = 0;
-+SMB_BIG_UINT get_total_size = 0;
-+unsigned int get_total_time_ms = 0;
-+SMB_BIG_UINT put_total_size = 0;
-+unsigned int put_total_time_ms = 0;
- 
- /* totals globals */
- static double dir_total;
diff --git a/packaging/Debian/debian/patches/smbmount-mtab-flags.patch b/packaging/Debian/debian/patches/smbmount-mtab-flags.patch
new file mode 100644
index 0000000000..dac999dd63
--- /dev/null
+++ b/packaging/Debian/debian/patches/smbmount-mtab-flags.patch
@@ -0,0 +1,15 @@
+diff -ur samba-2.2.4.orig/source/client/smbmnt.c samba-2.2.4/source/client/smbmnt.c
+--- samba-2.2.4.orig/source/client/smbmnt.c	Sun Apr  8 15:22:51 2001
++++ samba-2.2.4/source/client/smbmnt.c	Sun May  5 16:42:29 2002
+@@ -259,7 +259,10 @@
+         ment.mnt_fsname = share_name ? share_name : "none";
+         ment.mnt_dir = mount_point;
+         ment.mnt_type = "smbfs";
+-        ment.mnt_opts = "";
++	if (mount_ro)
++                ment.mnt_opts = "ro";
++        else
++                ment.mnt_opts = "rw";
+         ment.mnt_freq = 0;
+         ment.mnt_passno= 0;
+ 
diff --git a/packaging/Debian/debian/patches/smbmount-nomtab.patch b/packaging/Debian/debian/patches/smbmount-nomtab.patch
new file mode 100644
index 0000000000..8807148170
--- /dev/null
+++ b/packaging/Debian/debian/patches/smbmount-nomtab.patch
@@ -0,0 +1,160 @@
+diff -uNr samba-3.0alpha22.orig/source/client/smbmnt.c samba-3.0alpha22/source/client/smbmnt.c
+--- samba-3.0alpha22.orig/source/client/smbmnt.c	2003-03-15 12:11:39.000000000 -0600
++++ samba-3.0alpha22/source/client/smbmnt.c	2003-03-15 12:11:49.000000000 -0600
+@@ -28,6 +28,7 @@
+ static uid_t mount_uid;
+ static gid_t mount_gid;
+ static int mount_ro;
++static int no_mtab;
+ static unsigned mount_fmask;
+ static unsigned mount_dmask;
+ static int user_mount;
+@@ -40,6 +41,7 @@
+         printf("Usage: smbmnt mount-point [options]\n");
+ 	printf("Version %s\n\n",VERSION);
+         printf("-s share       share name on server\n"
++               "-n             don't update /etc/mtab\n"
+                "-r             mount read-only\n"
+                "-u uid         mount as uid\n"
+                "-g gid         mount as gid\n"
+@@ -54,7 +56,7 @@
+ {
+         int opt;
+ 
+-        while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
++        while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF)
+ 	{
+                 switch (opt)
+ 		{
+@@ -71,6 +73,9 @@
+ 				mount_gid = strtol(optarg, NULL, 0);
+ 			}
+                         break;
++		case 'n':
++			no_mtab = 1;
++			break;
+                 case 'r':
+                         mount_ro = 1;
+                         break;
+@@ -274,36 +279,38 @@
+ 		return -1;
+ 	}
+ 	
+-        if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
+-        {
+-                fprintf(stderr, "Can't get "MOUNTED"~ lock file");
+-                return 1;
+-        }
+-        close(fd);
++	if (!no_mtab) {
++		if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
++		{
++			fprintf(stderr, "Can't get "MOUNTED"~ lock file");
++			return 1;
++		}
++		close(fd);
+ 	
+-        if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
+-        {
+-                fprintf(stderr, "Can't open " MOUNTED);
+-                return 1;
+-        }
++		if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
++		{
++			fprintf(stderr, "Can't open " MOUNTED);
++			return 1;
++		}
+ 
+-        if (addmntent(mtab, &ment) == 1)
+-        {
+-                fprintf(stderr, "Can't write mount entry");
+-                return 1;
+-        }
+-        if (fchmod(fileno(mtab), 0644) == -1)
+-        {
+-                fprintf(stderr, "Can't set perms on "MOUNTED);
+-                return 1;
+-        }
+-        endmntent(mtab);
++		if (addmntent(mtab, &ment) == 1)
++		{
++			fprintf(stderr, "Can't write mount entry");
++			return 1;
++		}
++		if (fchmod(fileno(mtab), 0644) == -1)
++		{
++			fprintf(stderr, "Can't set perms on "MOUNTED);
++			return 1;
++		}
++		endmntent(mtab);
+ 
+-        if (unlink(MOUNTED"~") == -1)
+-        {
+-                fprintf(stderr, "Can't remove "MOUNTED"~");
+-                return 1;
+-        }
++		if (unlink(MOUNTED"~") == -1)
++		{
++			fprintf(stderr, "Can't remove "MOUNTED"~");
++			return 1;
++		}
++	}
+ 
+ 	return 0;
+ }	
+diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source/client/smbmount.c
+--- samba-3.0alpha22.orig/source/client/smbmount.c	2003-03-15 12:04:29.000000000 -0600
++++ samba-3.0alpha22/source/client/smbmount.c	2003-03-15 12:15:10.000000000 -0600
+@@ -48,6 +48,7 @@
+ static int mount_ro;
+ static unsigned mount_fmask;
+ static unsigned mount_dmask;
++static BOOL no_mtab = False;
+ static BOOL use_kerberos;
+ /* TODO: Add code to detect smbfs version in kernel */
+ static BOOL status32_smbfs = False;
+@@ -273,6 +274,9 @@
+                 return;
+         }
+ 
++	if (no_mtab)
++		return;
++
+         if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
+                 DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
+                 return;
+@@ -466,6 +470,9 @@
+ 	args[i++] = "-s";
+ 	args[i++] = svc2;
+ 
++	if (no_mtab) {
++		args[i++] = "-n";
++	}
+ 	if (mount_ro) {
+ 		args[i++] = "-r";
+ 	}
+@@ -661,7 +668,7 @@
+ ****************************************************************************/
+ static void usage(void)
+ {
+-	printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
++	printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
+ 
+ 	printf("Version %s\n\n",VERSION);
+ 
+@@ -739,8 +746,13 @@
+ 	argc -= 2;
+ 	argv += 2;
+ 
+-	opt = getopt(argc, argv, "o:");
+-	if(opt != 'o') {
++	opt = getopt(argc, argv, "no:");
++	if (opt == 'n') {
++		DEBUG(3,("No mtab!\n"));
++		no_mtab = True;
++		opt = getopt(argc, argv, "o:");
++	}
++	if (opt != 'o') {
+ 		return;
+ 	}
+ 
diff --git a/packaging/Debian/debian/patches/smbstatus-locking.patch b/packaging/Debian/debian/patches/smbstatus-locking.patch
new file mode 100644
index 0000000000..fe720c8187
--- /dev/null
+++ b/packaging/Debian/debian/patches/smbstatus-locking.patch
@@ -0,0 +1,20 @@
+diff -uNr samba-2.999+3.0.alpha21.orig/source/utils/status.c samba-2.999+3.0.alpha21/source/utils/status.c
+--- samba-2.999+3.0.alpha21.orig/source/utils/status.c	2002-11-26 20:54:22.000000000 -0600
++++ samba-2.999+3.0.alpha21/source/utils/status.c	2002-12-16 23:37:14.000000000 -0600
+@@ -635,6 +635,16 @@
+ 	if (!shares_only) {
+ 		int ret;
+ 
++		tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
++
++		if (!tdb) {
++			d_printf("%s not initialised\n", lock_path("locking.tdb"));
++			d_printf("This is normal if an SMB client has never connected to your server.\n");
++			exit(0);
++		} else {
++			tdb_close(tdb);
++		}
++
+ 		if (!locking_init(1)) {
+ 			d_printf("Can't initialise locking module - exiting\n");
+ 			exit(1);