X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=9b56318b109933756eb71ca8c3edc8d1d8b96700;hp=ee45da37c8da31c6603c1ccefe4f5b50afa78755;hb=faf9b6ea16029d11a6b577ec98a73466e5421f55;hpb=035f7fb2fe1761f522ce680a4ff1ac1a2a44611a

diff --git a/configure.in b/configure.in
index ee45da37..9b56318b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2008 Alexander Barton <alex@barton.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -8,13 +8,11 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.121 2006/09/09 17:07:39 fw Exp $
-#
 
 # -- Initialisation --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, CVSHEAD)
+AC_INIT(ngircd, HEAD)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)
@@ -30,6 +28,7 @@ AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
 AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
 AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
+AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled])
 AH_TEMPLATE([ZEROCONF], [Define if support for Zeroconf should be included])
 AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
 
@@ -138,17 +137,15 @@ AC_FUNC_STRFTIME
 
 AC_CHECK_FUNCS([ \
 	bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \
-	memset realloc setsid setsockopt socket strcasecmp strchr strerror \
+	memset realloc setsid setsockopt socket strcasecmp strchr strcspn strerror \
 	strstr waitpid],,AC_MSG_ERROR([required function missing!]))
 
 AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat)
 
-AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
-	AC_MSG_ERROR([required function select() is missing!])
-)
-
 # -- Configuration options --
 
+# use syslog?
+
 x_syslog_on=no
 AC_ARG_WITH(syslog,
 	[  --without-syslog        disable syslog (autodetected by default)],
@@ -174,6 +171,8 @@ if test "$x_syslog_on" = "yes"; then
 	AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
+# use zlib compression?
+
 x_zlib_on=no
 AC_ARG_WITH(zlib,
 	[  --without-zlib          disable zlib compression (autodetected by default)],
@@ -198,44 +197,120 @@ if test "$x_zlib_on" = "yes"; then
 	AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
+# detect which IO API to use:
+
+x_io_backend=none
+
+AC_ARG_WITH(select,
+	[  --without-select        disable select IO support (autodetected by default)],
+	[	if test "$withval" != "no"; then
+			if test "$withval" != "yes"; then
+				CFLAGS="-I$withval/include $CFLAGS"
+				CPPFLAGS="-I$withval/include $CPPFLAGS"
+				LDFLAGS="-L$withval/lib $LDFLAGS"
+			fi
+			AC_CHECK_FUNCS(select, x_io_select=yes,
+				AC_MSG_ERROR([Can't enable select IO support!])
+			)
+		fi
+	],
+	[
+		AC_CHECK_FUNCS(select, x_io_select=yes)
+	]
+)
+
+AC_ARG_WITH(poll,
+	[  --without-poll          disable poll support (autodetected by default)],
+	[	if test "$withval" != "no"; then
+			if test "$withval" != "yes"; then
+				CFLAGS="-I$withval/include $CFLAGS"
+				CPPFLAGS="-I$withval/include $CPPFLAGS"
+				LDFLAGS="-L$withval/lib $LDFLAGS"
+			fi
+			AC_CHECK_FUNCS(poll, x_io_backend=poll\(\),
+				AC_MSG_ERROR([Can't enable poll IO support!])
+			)
+		fi
+	],
+	[
+		AC_CHECK_FUNCS(poll, x_io_backend=poll\(\))
+	]
+)
+
+AC_ARG_WITH(devpoll,
+	[  --without-devpoll       disable /dev/poll IO support (autodetected by default)],
+	[	if test "$withval" != "no"; then
+			if test "$withval" != "yes"; then
+				CFLAGS="-I$withval/include $CFLAGS"
+				CPPFLAGS="-I$withval/include $CPPFLAGS"
+				LDFLAGS="-L$withval/lib $LDFLAGS"
+			fi
+
+				AC_CHECK_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!]))
+		fi
+	],
+	[
+		AC_CHECK_HEADERS(sys/devpoll.h, x_io_backend=/dev/poll)
+	]
+)
 
-x_io_backend=select
 AC_ARG_WITH(epoll,
-	[  --without-epoll         disable epoll support (autodetected by default)],
+	[  --without-epoll         disable epoll IO support (autodetected by default)],
 	[	if test "$withval" != "no"; then
 			if test "$withval" != "yes"; then
 				CFLAGS="-I$withval/include $CFLAGS"
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll,
-				AC_MSG_ERROR([Can't enable epoll support!])
+			AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes,
+				AC_MSG_ERROR([Can't enable epoll IO support!])
 			)
 		fi
 	],
 	[
-		AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll)
+		AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes)
 	]
 )
 
 AC_ARG_WITH(kqueue,
-	[  --without-kqueue        disable kqueue support (autodetected by default)],
+	[  --without-kqueue        disable kqueue IO support (autodetected by default)],
 	[	if test "$withval" != "no"; then
 			if test "$withval" != "yes"; then
 				CFLAGS="-I$withval/include $CFLAGS"
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue,
-				AC_MSG_ERROR([Can't enable kqueue support!])
+			AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
+				AC_MSG_ERROR([Can't enable kqueue IO support!])
 			)
 		fi
 	],
 	[
-		AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue)
+		AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\))
 	]
 )
 
+if test "$x_io_epoll" = "yes" -a "$x_io_select" = "yes"; then
+	# when epoll() and select() are available, we'll use both!
+	x_io_backend="epoll(), select()"
+else
+	if test "$x_io_epoll" = "yes"; then
+		# we prefere epoll() if it is available
+		x_io_backend="epoll()"
+	else
+		if test "$x_io_select" = "yes" -a "$x_io_backend" = "none"; then
+			# we'll use select, when available and no "better"
+			# interface has been detected ...
+			x_io_backend="select()"
+		fi
+	fi
+fi
+
+if test "$x_io_backend" = "none"; then
+	AC_MSG_ERROR([No useabe IO API activated/found!?])
+fi
+
+# use TCP wrappers?
 
 x_tcpwrap_on=no
 AC_ARG_WITH(tcp-wrappers,
@@ -266,6 +341,8 @@ int deny_severity = 0;
 	]
 )
 
+# include support for "zeroconf"?
+
 x_zeroconf_on=no
 AC_ARG_WITH(zeroconf,
 	[  --with-zeroconf         enable support for "Zeroconf"],
@@ -314,6 +391,8 @@ if test "$x_zeroconf_on" = "howl"; then
 	AC_DEFINE(ZEROCONF, 1)
 fi
 
+# do IDENT requests using libident?
+
 x_identauth_on=no
 AC_ARG_WITH(ident,
 	[  --with-ident            enable "IDENT" ("AUTH") protocol support],
@@ -335,6 +414,8 @@ if test "$x_identauth_on" = "yes"; then
 	AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!]))
 fi
 
+# compile in IRC+ protocol support?
+
 x_ircplus_on=yes
 AC_ARG_ENABLE(ircplus,
 	[  --disable-ircplus       disable IRC+ protocol],
@@ -344,6 +425,21 @@ if test "$x_ircplus_on" = "yes"; then
 	AC_DEFINE(IRCPLUS, 1)
 fi
 
+# enable support for IPv6?
+x_ipv6_on=no
+AC_ARG_ENABLE(ipv6,
+	[  --enable-ipv6           enable IPv6 protocol support],
+	if test "$enableval" = "yes"; then x_ipv6_on=yes; fi
+)
+if test "$x_ipv6_on" = "yes"; then
+	AC_CHECK_FUNCS([ \
+		getaddrinfo getnameinfo \
+		],,AC_MSG_ERROR([required function missing for IPv6 support!]))
+	AC_DEFINE(WANT_IPV6, 1)
+fi
+
+# compile in IRC "sniffer"?
+
 x_sniffer_on=no; x_debug_on=no
 AC_ARG_ENABLE(sniffer,
 	[  --enable-sniffer        enable IRC traffic sniffer (enables debug mode)],
@@ -353,6 +449,8 @@ AC_ARG_ENABLE(sniffer,
 	fi
 )
 
+# enable additional debugging code?
+
 AC_ARG_ENABLE(debug,
 	[  --enable-debug          show additional debug output],
 	if test "$enableval" = "yes"; then x_debug_on=yes; fi
@@ -362,6 +460,8 @@ if test "$x_debug_on" = "yes"; then
 	test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS"
 fi
 
+# enable "strict RFC rules"?
+
 x_strict_rfc_on=no
 AC_ARG_ENABLE(strict-rfc,
 	[  --enable-strict-rfc     strict RFC conformance -- may break clients!],
@@ -389,6 +489,7 @@ AC_OUTPUT([ \
 	doc/src/Makefile \
 	src/Makefile \
 	src/portab/Makefile \
+	src/ipaddr/Makefile \
 	src/tool/Makefile \
 	src/ngircd/Makefile \
 	src/testsuite/Makefile \
@@ -396,6 +497,7 @@ AC_OUTPUT([ \
 	contrib/Makefile \
 	contrib/Debian/Makefile \
 	contrib/MacOSX/Makefile \
+	contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
 ])
 
 type dpkg >/dev/null 2>&1
@@ -482,8 +584,10 @@ test "$x_identauth_on" = "yes" \
 	&& echo $ECHO_N "yes   $ECHO_C" \
 	|| echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "        I/O backend: $ECHO_C"
-	echo "\"$x_io_backend()\""
+	echo "\"$x_io_backend\""
 
+echo $ECHO_N "      IPv6 protocol: $ECHO_C"
+echo "$x_ipv6_on"
 echo
 
 # -eof-