svn commit: samba r3335 - in branches/SAMBA_4_0/source/lib/socket: .

tridge at samba.org tridge at samba.org
Thu Oct 28 21:47:10 GMT 2004


Author: tridge
Date: 2004-10-28 21:47:10 +0000 (Thu, 28 Oct 2004)
New Revision: 3335

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3335

Log:
better configure support for ipv6 - thanks to a quick tutorial from metze


Modified:
   branches/SAMBA_4_0/source/lib/socket/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.m4	2004-10-28 21:41:21 UTC (rev 3334)
+++ branches/SAMBA_4_0/source/lib/socket/config.m4	2004-10-28 21:47:10 UTC (rev 3335)
@@ -2,10 +2,16 @@
 SMB_MODULE_MK(socket_ipv4,SOCKET,STATIC,lib/socket/config.mk)
 SMB_MODULE_MK(socket_unix,SOCKET,STATIC,lib/socket/config.mk)
 
+dnl test for ipv6 using the gethostbyname2() function. That should be sufficient
+dnl for now
 AC_CHECK_FUNCS(gethostbyname2, have_ipv6=true, have_ipv6=false)
 if $have_ipv6 = true; then
+    SMB_MODULE_DEFAULT(socket_ipv6, STATIC)
     AC_DEFINE(HAVE_SOCKET_IPV6,1,[Whether the system has ipv6 support])
-    SMB_MODULE_MK(socket_ipv6,SOCKET,STATIC,lib/socket/config.mk)
 fi
 
+dnl don't build ipv6 by default, unless the above test enables it, or
+dnl the configure uses --with-static-modules=socket_ipv6
+SMB_MODULE_MK(socket_ipv6,SOCKET,NOT,lib/socket/config.mk)
+
 SMB_SUBSYSTEM_MK(SOCKET,lib/socket/config.mk)



More information about the samba-cvs mailing list