From eb23089183745853fac9414d45a559a478ef51d6 Mon Sep 17 00:00:00 2001 From: JuanJo Ciarlante Date: Thu, 26 May 2011 19:01:42 +0200 Subject: USE_PF_INET6 by default for v2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - put all #ifdef'd code in place, kill the cpp symbol, - thus in v2.3 it's not actually possible to --disable-ipv6 :) RATIONALE: #1 some wacky compilers choke on #ifdef'd constructions for concatenated strings, and given that: #2 v2.3 has already transport ipv6 by default => doesn't justify putting effort on #1 to keep USE_PF_INET6 ifdef wraps. Signed-off-by: JuanJo Ciarlante Signed-off-by: Samuli Seppänen Acked-by: David Sommerseth Signed-off-by: David Sommerseth --- configure.ac | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a3789d9..5024d6a 100644 --- a/configure.ac +++ b/configure.ac @@ -152,12 +152,6 @@ AC_ARG_ENABLE(multihome, [MULTIHOME="yes"] ) -AC_ARG_ENABLE(ipv6, - [ --disable-ipv6 Disable UDP/IPv6 support], - [PF_INET6="$enableval"], - [PF_INET6="yes"] -) - AC_ARG_ENABLE(port-share, [ --disable-port-share Disable TCP server port-share support (--port-share)], [PORT_SHARE="$enableval"], @@ -579,14 +573,12 @@ AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL_CREATE, 1, [epoll_create functi LDFLAGS="$OLDLDFLAGS" dnl ipv6 support -if test "$PF_INET6" = "yes"; then - AC_CHECKING([for struct sockaddr_in6 for IPv6 support]) - AC_CHECK_TYPE( +AC_CHECKING([for struct sockaddr_in6 for IPv6 support]) +AC_CHECK_TYPE( [struct sockaddr_in6], - [AC_DEFINE(USE_PF_INET6, 1, [struct sockaddr_in6 is needed for IPv6 peer support])], [], + [AC_MSG_ERROR([struct sockaddr_in6 not found, needed for ipv6 transport support.])], [#include "syshead.h"]) -fi dnl dnl check for valgrind tool -- cgit