aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-06-01 09:19:16 +0000
committerYang Tse <yangsita@gmail.com>2009-06-01 09:19:16 +0000
commit61a967095d97d6b6d28d4d4bcec432e338f7368b (patch)
tree2451d0cf6629e118ba9b2d7243b89222e3c515b0
parentc0e004ec1c427101f2f90cd264bcab152e016dcc (diff)
John E. Malmberg noticed that the configure script was failing to detect the
timeval struct on VMS when building with _XOPEN_SOURCE_EXTENDED undefined due to definition taking place in socket.h instead of time.h
-rw-r--r--acinclude.m45
-rw-r--r--ares/acinclude.m45
2 files changed, 8 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 790248b08..092cd4e40 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1852,7 +1852,7 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
AC_REQUIRE([AC_HEADER_TIME])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
- AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)
+ AC_CHECK_HEADERS(sys/types.h sys/time.h time.h sys/socket.h)
AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
@@ -1883,6 +1883,9 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
#include <time.h>
#endif
#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
]],[[
struct timeval ts;
ts.tv_sec = 0;
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index e9690a713..6594b6fb6 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -1320,7 +1320,7 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
AC_REQUIRE([AC_HEADER_TIME])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
- AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)
+ AC_CHECK_HEADERS(sys/types.h sys/time.h time.h sys/socket.h)
AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
@@ -1351,6 +1351,9 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
#include <time.h>
#endif
#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
]],[[
struct timeval ts;
ts.tv_sec = 0;