Index: configure
===================================================================
--- configure	(revision 124708)
+++ configure	(working copy)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 119800 .
+# From configure.ac Revision: 123332 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -1567,6 +1567,7 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-dev-mode    Turn on developer mode
   --disable-largefile     omit support for large files
+  --enable-internal-poll	Use Asterisk's poll implementation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -15528,7 +15529,19 @@
 
 
 
+# Check whether --enable-internal-poll was given.
+if test "${enable_internal_poll+set}" = set; then
+  enableval=$enable_internal_poll; case "${enableval}" in
+		y|ye|yes) HAS_POLL="";;
+		n|no) HAS_POLL="${HAS_POLL}" ;;
+		*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-internal-poll" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-internal-poll" >&2;}
+   { (exit 1); exit 1; }; } ;;
+	esac
+fi
 
+
+
 # https support (in main/http.c) uses funopen on BSD systems,
 # fopencookie on linux
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 124708)
+++ configure.ac	(working copy)
@@ -325,6 +325,14 @@
    [HAS_POLL=1]
    AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]),
    )
+
+AC_ARG_ENABLE(internal-poll,
+	[  --enable-internal-poll	Use Asterisk's poll implementation],
+	[case "${enableval}" in
+		y|ye|yes) HAS_POLL="";;
+		n|no) HAS_POLL="${HAS_POLL}" ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-internal-poll) ;;
+	esac])
 AC_SUBST(HAS_POLL)
 
 # https support (in main/http.c) uses funopen on BSD systems,