You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/09/29 06:26:26 UTC
cvs commit: apache-2.0/src/lib/apr aclocal.m4 configure.in
rbb 00/09/28 21:26:25
Modified: src/lib/apr aclocal.m4 configure.in
Log:
Add to the check for POLLIN. If poll.h is found in include/sys not
include, then we need to check for POLLIN in include/sys/poll.h. Rather
than modify an existing test, I have created a new test to look for a
definition in multiple header files.
Revision Changes Path
1.26 +16 -0 apache-2.0/src/lib/apr/aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- aclocal.m4 2000/09/17 21:42:09 1.25
+++ aclocal.m4 2000/09/29 04:26:24 1.26
@@ -10,6 +10,22 @@
dnl ##
dnl ##
dnl ##
+AC_DEFUN(AC_CHECK_DEFINE_FILES,[
+ AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
+ AC_EGREP_CPP(YES_IS_DEFINED, [
+ $2
+ #ifdef $1
+ YES_IS_DEFINED
+ #endif
+ ], ac_cv_define_$1=yes, ac_cv_define_$1=no)
+ ])
+ if test "$ac_cv_define_$1" = "yes"; then
+ AC_DEFINE(HAVE_$1)
+ fi
+])
+dnl ##
+dnl ##
+dnl ##
AC_DEFUN(AC_CHECK_DEFINE,[
AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
AC_EGREP_CPP(YES_IS_DEFINED, [
1.152 +3 -1 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- configure.in 2000/09/29 04:03:20 1.151
+++ configure.in 2000/09/29 04:26:24 1.152
@@ -598,7 +598,9 @@
AC_CHECK_DEFINE(isascii, ctype.h)
# We are assuming that if the platform doesn't have POLLIN, it doesn't have
# any POLL definitions.
-AC_CHECK_DEFINE(POLLIN, poll.h)
+AC_CHECK_DEFINE_FILES(POLLIN, [
+#include <poll.h>
+#include <sys/poll.h> ] )
pthreadser="0"
if test "$threads" = "1"; then