Check for poll.h and use that if it exists

5 files changed, 20 insertions, 15 deletions

diff --git a/configure b/configure
index 58e9284..8dd54aa 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pam_radius $Id$.
+# Generated by GNU Autoconf 2.69 for pam_radius 1.5.
 #
 # Report bugs to <http://bugs.freeradius.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pam_radius'
 PACKAGE_TARNAME='pam_radius'
-PACKAGE_VERSION='$Id$'
-PACKAGE_STRING='pam_radius $Id$'
+PACKAGE_VERSION='1.5'
+PACKAGE_STRING='pam_radius 1.5'
 PACKAGE_BUGREPORT='http://bugs.freeradius.org'
 PACKAGE_URL='http://www.freeradius.org'
 
@@ -1248,7 +1248,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pam_radius $Id$ to adapt to many kinds of systems.
+\`configure' configures pam_radius 1.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1314,7 +1314,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pam_radius $Id$:";;
+     short | recursive ) echo "Configuration of pam_radius 1.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1403,7 +1403,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pam_radius configure $Id$
+pam_radius configure 1.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1864,7 +1864,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pam_radius $as_me $Id$, which was
+It was created by pam_radius $as_me 1.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4507,6 +4507,7 @@ for ac_header in \
 	sys/time.h \
 	sys/types.h \
 	syslog.h \
+	poll.h \
 	time.h \
 	unistd.h \
 	utmp.h
@@ -5783,7 +5784,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pam_radius $as_me $Id$, which was
+This file was extended by pam_radius $as_me 1.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5837,7 +5838,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pam_radius config.status $Id$
+pam_radius config.status 1.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 604c868..3767085 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl #############################################################
 AC_PREREQ([2.59])
 export CFLAGS LIBS LDFLAGS CPPFLAGS
 
-AC_INIT([pam_radius],[$]Id[$],[http://bugs.freeradius.org],,[http://www.freeradius.org])
+AC_INIT([pam_radius],1.5,[http://bugs.freeradius.org],,[http://www.freeradius.org])
 AC_CONFIG_SRCDIR([src/pam_radius_auth.c])
 AC_CONFIG_HEADER([src/config.h])
 m4_include([m4/ax_cc.m4])
@@ -173,6 +173,7 @@ AC_CHECK_HEADERS( \
 	sys/time.h \
 	sys/types.h \
 	syslog.h \
+	poll.h \
 	time.h \
 	unistd.h \
 	utmp.h
diff --git a/src/config.h.in b/src/config.h.in
index 4780376..4cc9789 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -62,6 +62,9 @@
 /* Define to 1 if you have the <pam/pam_modules.h> header file. */
 #undef HAVE_PAM_PAM_MODULES_H
 
+/* Define to 1 if you have the <poll.h> header file. */
+#undef HAVE_POLL_H
+
 /* Define to 1 if you have the <security/pam_appl.h> header file. */
 #undef HAVE_SECURITY_PAM_APPL_H
 
diff --git a/src/pam_radius_auth.c b/src/pam_radius_auth.c
index b7c4e96..a27f90b 100644
--- a/src/pam_radius_auth.c
+++ b/src/pam_radius_auth.c
@@ -709,7 +709,7 @@ static int talk_radius(radius_conf_t *conf, AUTH_HDR *request, AUTH_HDR *respons
 {
 	socklen_t salen;
 	int total_length;
-#ifdef WITH_POLL
+#ifdef HAVE_POLL_H
 	struct pollfd pollfds[1];
 #else
 	fd_set set;
@@ -785,7 +785,7 @@ static int talk_radius(radius_conf_t *conf, AUTH_HDR *request, AUTH_HDR *respons
 		tv.tv_usec = 0;
 		end = now + tv.tv_sec;
 
-#ifdef WITH_POLL
+#ifdef HAVE_POLL_H
 		pollfds[0].fd = conf->sockfd;   /* wait only for the RADIUS UDP socket */
 		pollfds[0].events = POLLIN;     /* wait for data to read */
 #else
@@ -796,7 +796,7 @@ static int talk_radius(radius_conf_t *conf, AUTH_HDR *request, AUTH_HDR *respons
 		/* loop, waiting for the network to return data */
 		ok = TRUE;
 		while (ok) {
-#ifdef WITH_POLL
+#ifdef HAVE_POLL_H
 			rcode = poll((struct pollfd *) &pollfds, 1, tv.tv_sec * 1000);
 #else
 			rcode = select(conf->sockfd + 1, &set, NULL, NULL, &tv);
@@ -838,7 +838,7 @@ static int talk_radius(radius_conf_t *conf, AUTH_HDR *request, AUTH_HDR *respons
 				}
 
 			/* the call returned OK */
-#ifdef WITH_POLL
+#ifdef HAVE_POLL_H
 			} else if (pollfds[0].revents & POLLIN) {
 #else
 			} else if (FD_ISSET(conf->sockfd, &set)) {
diff --git a/src/pam_radius_auth.h b/src/pam_radius_auth.h
index 742e912..b3f7839 100644
--- a/src/pam_radius_auth.h
+++ b/src/pam_radius_auth.h
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <arpa/inet.h>
 
-#ifdef WITH_POLL
+#ifdef HAVE_POLL_H
 #include <poll.h>
 #endif