summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2012-11-23 17:57:00 +0100
committerYang Tse <yangsita@gmail.com>2012-11-23 17:57:00 +0100
commit665adcd4b7bcdb7deb638cdc499fbe71f8d777f2 (patch)
tree6317256953017d01d4a8d72fdcf0f7e992e998df /acinclude.m4
parent91dc73ef445c5d382a72db21468289ae8a9e80e3 (diff)
downloadcurl-665adcd4b7bcdb7deb638cdc499fbe71f8d777f2.tar.gz
build: fix AIX compilation and usage
AIX sys/poll.h header file defines 'events' and 'revents' as C preprocessor macros. Usage of these literals in libcurl's external API was introduced in commit de24d7bd4c causing AIX build failures. Appropriate inclusion of sys/poll.h by libcurl's external interface fixes AIX build and usage issues while avoiding a SONAME bump.
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m442
1 files changed, 42 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 930574542..ae9d8cdda 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -150,6 +150,7 @@ AC_DEFUN([CURL_CHECK_AIX_ALL_SOURCE], [
#endif])
AC_BEFORE([$0], [AC_SYS_LARGEFILE])dnl
AC_BEFORE([$0], [CURL_CONFIGURE_REENTRANT])dnl
+ AC_BEFORE([$0], [CURL_CONFIGURE_PULL_SYS_POLL])dnl
AC_MSG_CHECKING([if OS is AIX (to define _ALL_SOURCE)])
AC_EGREP_CPP([yes_this_is_aix],[
#ifdef _AIX
@@ -2310,6 +2311,8 @@ AC_DEFUN([CURL_CONFIGURE_CURL_SOCKLEN_T], [
AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])dnl
AC_REQUIRE([CURL_PREPROCESS_CALLCONV])dnl
#
+ AC_BEFORE([$0], [CURL_CONFIGURE_PULL_SYS_POLL])dnl
+ #
AC_MSG_CHECKING([for curl_socklen_t data type])
curl_typeof_curl_socklen_t="unknown"
for arg1 in int SOCKET; do
@@ -2418,6 +2421,45 @@ AC_DEFUN([CURL_CONFIGURE_CURL_SOCKLEN_T], [
])
+dnl CURL_CONFIGURE_PULL_SYS_POLL
+dnl -------------------------------------------------
+dnl Find out if system header file sys/poll.h must be included by the
+dnl external interface, making appropriate definitions for template file
+dnl include/curl/curlbuild.h.in to properly configure and use the library.
+dnl
+dnl The need for the sys/poll.h inclusion arises mainly to properly
+dnl interface AIX systems which define macros 'events' and 'revents'.
+
+AC_DEFUN([CURL_CONFIGURE_PULL_SYS_POLL], [
+ AC_REQUIRE([CURL_INCLUDES_POLL])dnl
+ #
+ tst_poll_events_macro_defined="unknown"
+ #
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([[
+ $curl_includes_poll
+ ]],[[
+#if defined(events) || defined(revents)
+ return 0;
+#else
+ force compilation error
+#endif
+ ]])
+ ],[
+ tst_poll_events_macro_defined="yes"
+ ],[
+ tst_poll_events_macro_defined="no"
+ ])
+ #
+ if test "$tst_poll_events_macro_defined" = "yes"; then
+ if test "x$ac_cv_header_sys_poll_h" = "xyes"; then
+ CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_POLL_H])
+ fi
+ fi
+ #
+])
+
+
dnl CURL_CHECK_FUNC_SELECT
dnl -------------------------------------------------
dnl Test if the socket select() function is available,