From 0b3deceea3c5ceebd614bfabe3fea3a26db2f4e3 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 13 May 2005 21:19:21 +0000
Subject: [PATCH] adjusted the configure to always skip the fine-poll() test on
Mac OS X (darwin)
---
CHANGES | 6 ++++++
configure.ac | 39 ++++++++++++++++++++++++++-------------
2 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/CHANGES b/CHANGES
index 5e6241cf91..4a537f8b09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,12 @@
Changelog
+Daniel (13 May 2005)
+- Grigory Entin reported that curl's configure detects a fine poll() for Mac
+ OS X 10.4 (while 10.3 or later detected a "bad" one), but the executable
+ doesn't work as good as if built without poll(). I've adjusted the configure
+ to always skip the fine-poll() test on Mac OS X (darwin).
+
Daniel (12 May 2005)
- When doing a second request (after a disconnect) using the same easy handle,
over a proxy that uses NTLM authentication, libcurl failed to use NTLM again
diff --git a/configure.ac b/configure.ac
index dcb8067fbc..ef77da6649 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1495,11 +1495,24 @@ AC_CHECK_DECL(basename, ,
#endif
)
-dnl poll() might be badly emulated, as in Mac OS X 10.3 (and other BSDs?) and
-dnl to find out we make an extra check here!
-if test "$ac_cv_func_poll" = "yes"; then
- AC_MSG_CHECKING([if poll works with NULL inputs])
- AC_RUN_IFELSE([
+AC_MSG_CHECKING([if we are Mac OS X (to disable poll)])
+disable_poll=no
+case $host in
+ *-*-darwin*)
+ disable_poll="yes";
+ ;;
+ *)
+ ;;
+esac
+AC_MSG_RESULT($disable_poll)
+
+if test "$disable_poll" = "no"; then
+
+ dnl poll() might be badly emulated, as in Mac OS X 10.3 (and other BSDs?) and
+ dnl to find out we make an extra check here!
+ if test "$ac_cv_func_poll" = "yes"; then
+ AC_MSG_CHECKING([if poll works with NULL inputs])
+ AC_RUN_IFELSE([
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
@@ -1510,14 +1523,14 @@ if test "$ac_cv_func_poll" = "yes"; then
return poll((void *)0, 0, 10 /*ms*/);
}
],
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_POLL_FINE, 1, [If you have a fine poll]),
- AC_MSG_RESULT(no),
- AC_MSG_RESULT(cross-compiling assumes yes)
- AC_DEFINE(HAVE_POLL_FINE, 1, [If you have a fine poll])
- ) dnl end of AC_RUN_IFELSE
-fi
-
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_POLL_FINE, 1, [If you have a fine poll]),
+ AC_MSG_RESULT(no),
+ AC_MSG_RESULT(cross-compiling assumes yes)
+ AC_DEFINE(HAVE_POLL_FINE, 1, [If you have a fine poll])
+ ) dnl end of AC_RUN_IFELSE
+ fi dnl poll() was found
+fi dnl poll()-check is not disabled
AC_PATH_PROG( PERL, perl, ,
--
GitLab