From b85f7857dc82ca1dbde1a91463cfe83cbcbee5f7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 Sep 2005 14:09:38 +0000
Subject: r10452: Couple of small scons updates - ignore .sconsign files (This
 used to be commit b2d2b4f23393c727ae3feeaf4b4b65bc03a673f7)

---
 source4/lib/replace/README    |  3 +++
 source4/lib/replace/config.m4 |  1 +
 source4/lib/socket/config.m4  | 13 -------------
 3 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'source4/lib')

diff --git a/source4/lib/replace/README b/source4/lib/replace/README
index 74b5397949..6575112eff 100644
--- a/source4/lib/replace/README
+++ b/source4/lib/replace/README
@@ -47,6 +47,9 @@ strerror
 errno
 mkstemp (a secure one!)
 
+Types:
+socklen_t
+
 Prerequisites:
 memset (for bzero)
 syslog (for vsyslog)
diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index 88e3be5e94..3dbb5e4cf1 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -16,6 +16,7 @@ if test x"$samba_cv_REPLACE_INET_NTOA" = x"yes"; then
 fi
 
 dnl Provided by replace.c:
+AC_HAVE_TYPE([socklen_t], [#include <sys/socket.h>])
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
 AC_CHECK_FUNCS(strtoull __strtoull strtouq strtoll __strtoll strtoq)
 AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
index 786d6c72bc..daa85803dc 100644
--- a/source4/lib/socket/config.m4
+++ b/source4/lib/socket/config.m4
@@ -1,18 +1,5 @@
 AC_CHECK_HEADERS(sys/socket.h sys/sockio.h sys/un.h)
 
-AC_CACHE_CHECK([for socklen_t type],samba_cv_socklen_t, [
-    AC_TRY_COMPILE([
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-#include <sys/socket.h>],[socklen_t i = 0],
-	samba_cv_socklen_t=yes,samba_cv_socklen_t=no)])
-if test x"$samba_cv_socklen_t" = x"yes"; then
-   AC_DEFINE(HAVE_SOCKLEN_T_TYPE,1,[Whether we have the variable type socklen_t])
-fi
-
 AC_CACHE_CHECK([for sin_len in sock],samba_cv_HAVE_SOCK_SIN_LEN,[
 AC_TRY_COMPILE([#include <sys/types.h>
 #include <sys/socket.h>
-- 
cgit