about summary refs log tree commit diff
path: root/configure.in
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2006-09-17 10:41:06 +0000
committerFlorian Westphal <fw@strlen.de>2006-09-17 10:41:06 +0000
commit639eb400354dc5b69deb17f20a52e0045f6e93e4 (patch)
treefba51d7a42bbb8652c8a6ab041e735baedf304e0 /configure.in
parent0d6f9d4e3ea86e083ebd5f6e71d3f1a9133468d1 (diff)
downloadngircd-639eb400354dc5b69deb17f20a52e0045f6e93e4.tar.gz
ngircd-639eb400354dc5b69deb17f20a52e0045f6e93e4.zip
Added support for the /dev/poll i/o interface.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in35
1 files changed, 26 insertions, 9 deletions
diff --git a/configure.in b/configure.in
index 2381916b..dcb040c1 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.122 2006/09/16 15:00:09 fw Exp $
+# $Id: configure.in,v 1.123 2006/09/17 10:41:06 fw Exp $
 #
 
 # -- Initialisation --
@@ -199,7 +199,7 @@ if test "$x_zlib_on" = "yes"; then
 fi
 
 
-x_io_backend=select
+x_io_backend=select\(\)
 AC_ARG_WITH(poll,
 	[  --without-poll          disable poll support (autodetected by default)],
 	[	if test "$withval" != "no"; then
@@ -208,17 +208,34 @@ AC_ARG_WITH(poll,
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(poll, x_io_backend=poll,
+			AC_CHECK_FUNCS(poll, x_io_backend=poll\(\),
 				AC_MSG_ERROR([Can't enable poll support!])
 			)
 		fi
 	],
 	[
-		AC_CHECK_FUNCS(poll, x_io_backend=poll)
+		AC_CHECK_FUNCS(poll, x_io_backend=poll\(\))
 	]
 )
 
 
+AC_ARG_WITH(devpoll,
+	[  --without-devpoll          disable /dev/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_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!]))
+		fi
+	],
+	[
+		AC_CHECK_HEADERS(sys/devpoll.h,x_io_backend=/dev/poll,)
+	]
+)
+
 AC_ARG_WITH(epoll,
 	[  --without-epoll         disable epoll support (autodetected by default)],
 	[	if test "$withval" != "no"; then
@@ -227,13 +244,13 @@ AC_ARG_WITH(epoll,
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll,
+			AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll\(\),
 				AC_MSG_ERROR([Can't enable epoll support!])
 			)
 		fi
 	],
 	[
-		AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll)
+		AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll\(\))
 	]
 )
 
@@ -246,13 +263,13 @@ AC_ARG_WITH(kqueue,
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue,
+			AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\),
 				AC_MSG_ERROR([Can't enable kqueue support!])
 			)
 		fi
 	],
 	[
-		AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue)
+		AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\))
 	]
 )
 
@@ -502,7 +519,7 @@ 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