Merge branch 'better-chan-errors'

[ngircd-alex.git] / configure.in

diff --git a/configure.in b/configure.in
index 92434ec7d044945f9a25914804cd0df289acade1..52435fd4df7b419f98de0b0305447ee75a1b9867 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
 #
 # 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
@@ -18,7 +18,7 @@ AC_INIT(ngircd, VERSION_ID)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADER(src/config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -252,13 +252,21 @@ 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, [
+                               AC_CHECK_HEADERS(poll.h,
+                                       x_io_backend=poll\(\),
+                                       AC_MSG_ERROR(
+                                            [Can't enable poll IO support!])
+                               )
+                       ], [
                                AC_MSG_ERROR([Can't enable poll IO support!])
-                       )
+                       ])
                fi
        ],
        [
-               AC_CHECK_FUNCS(poll, x_io_backend=poll\(\))
+               AC_CHECK_FUNCS(poll, [
+                       AC_CHECK_HEADERS(poll.h, x_io_backend=poll\(\))
+               ])
        ]
 )
 
@@ -332,7 +340,7 @@ else
 fi
 
 if test "$x_io_backend" = "none"; then
-       AC_MSG_ERROR([No useabe IO API activated/found!?])
+       AC_MSG_ERROR([No useable IO API activated/found!?])
 fi
 
 # use SSL?