[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2397-g5967d2a

[Stefan Metzmacher]

The branch, v3-2-test has been updated
       via  5967d2a5d6e9547d868bd85e3f3d3936bbd07fa9 (commit)
       via  c03fa242403fe28bc2b6ea84834457ce2410d3ca (commit)
       via  757071e59e4c1be0971b68d33833c621ed6bf361 (commit)
      from  c30932e79390307790c70bf0b0addc8a160dbbaf (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 5967d2a5d6e9547d868bd85e3f3d3936bbd07fa9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed May 21 22:32:21 2008 +0200

    configure: samba_cv_unixsocket was renamed into libreplace_cv_HAVE_UNIXSOCKET
    
    metze

commit c03fa242403fe28bc2b6ea84834457ce2410d3ca
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed May 21 22:31:08 2008 +0200

    configure: remove HAVE_IPV6 test as LIBREPLACE_NETWORK_CHECKS already have this
    
    metze

commit 757071e59e4c1be0971b68d33833c621ed6bf361
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed May 21 21:27:45 2008 +0200

    libreplace: add test for HAVE_IPV6
    
    Samba can later just check libreplace_cv_HAVE_IPV6 = yes.
    
    metze
    (cherry picked from commit e835e7eebcc064ce0813814796828f15ad112fbd)

-----------------------------------------------------------------------

Summary of changes:
 source/configure.in                      |   25 +------------------------
 source/lib/replace/libreplace_network.m4 |   29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index f941f58..8971945 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -2608,29 +2608,6 @@ SMB_CHECK_SYSCONF(_SC_NPROCESSORS_ONLN)
 SMB_CHECK_SYSCONF(_SC_PAGESIZE)
 AC_CHECK_FUNCS(getpagesize)
 
-dnl test for ipv6
-AC_CACHE_CHECK([for ipv6 support],samba_cv_HAVE_IPV6,[
-AC_TRY_COMPILE([
-#include <stdlib.h> /* for NULL */
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netdb.h>],
-[
-struct sockaddr_storage sa_store;
-struct addrinfo *ai = NULL;
-struct in6_addr in6addr;
-int s = socket(AF_INET6, SOCK_STREAM, 0);
-int ret = getaddrinfo(NULL, NULL, NULL, &ai);
-if (ret != 0) {
-	const char *es = gai_strerror(ret);
-}
-freeaddrinfo(ai);
-],
-samba_cv_HAVE_IPV6=yes,samba_cv_HAVE_IPV6=no)])
-if test x"$samba_cv_HAVE_IPV6" = x"yes"; then
-    AC_DEFINE(HAVE_IPV6,1,[Whether the system has IPv6 support])
-fi
-
 ################################################
 # look for a method of setting the effective uid
 seteuid=no;
@@ -5718,7 +5695,7 @@ AC_ARG_WITH(winbind,
 # We need unix domain sockets for winbind
 
 if test x"$HAVE_WINBIND" = x"yes"; then
-	if test x"$samba_cv_unixsocket" = x"no"; then
+	if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"no"; then
 		winbind_no_reason=", no unix domain socket support on $host_os"
 		HAVE_WINBIND=no
 	fi
diff --git a/source/lib/replace/libreplace_network.m4 b/source/lib/replace/libreplace_network.m4
index f2d177b..6cde6b9 100644
--- a/source/lib/replace/libreplace_network.m4
+++ b/source/lib/replace/libreplace_network.m4
@@ -339,6 +339,35 @@ if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
 fi
 fi
 
+dnl test for ipv6
+AC_CACHE_CHECK([for ipv6 support],libreplace_cv_HAVE_IPV6,[
+	AC_TRY_COMPILE([
+#include <stdlib.h> /* for NULL */
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netdb.h>
+		],
+		[
+struct sockaddr_storage sa_store;
+struct addrinfo *ai = NULL;
+struct in6_addr in6addr;
+int idx = if_nametoindex("iface1");
+int s = socket(AF_INET6, SOCK_STREAM, 0);
+int ret = getaddrinfo(NULL, NULL, NULL, &ai);
+if (ret != 0) {
+	const char *es = gai_strerror(ret);
+}
+freeaddrinfo(ai);
+		],[
+		libreplace_cv_HAVE_IPV6=yes
+		],[
+		libreplace_cv_HAVE_IPV6=no
+		])
+])
+if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
+    AC_DEFINE(HAVE_IPV6,1,[Whether the system has IPv6 support])
+fi
+
 LIBS=$old_LIBS
 CPPFLAGS="$SAVE_CPPFLAGS"
 


-- 
Samba Shared Repository