diff options
| author | Michael Forney <mforney@mforney.org> | 2021-04-07 00:32:47 -0700 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-04-07 16:08:01 +0200 |
| commit | eaa1d73229d5aa0c27ec09572b8abdac2676990a (patch) | |
| tree | 5c9c7a89492a14270852d2157415b36e42ab0f9b /m4 | |
| parent | 812fce9dcfaf26f62b8bfb83ee51b43f83c5291f (diff) | |
| download | curl-eaa1d73229d5aa0c27ec09572b8abdac2676990a.tar.gz | |
configure: include <time.h> unconditionally
In 2682e5f5, several instances of AC_HEADER_TIME were removed since
it is a deprecated autoconf macro. However, this was the macro that
defined TIME_WITH_SYS_TIME, which was used to indicate that <time.h>
can be included alongside <sys/time.h>. TIME_WITH_SYS_TIME is still
used in the configure test body and since it is no longer defined,
<time.h> is *not* included on systems that have <sys/time.h>.
In particular, at least on musl libc and glibc, <sys/time.h> does
not implicitly include <time.h> and does not declare clock_gettime,
gmtime_r, or localtime_r. This causes configure to fail to detect
those functions.
The AC_HEADER_TIME macro deprecation text says
> All current systems provide time.h; it need not be checked for.
> Not all systems provide sys/time.h, but those that do, all allow
> you to include it and time.h simultaneously.
So, to fix this issue, simply include <time.h> unconditionally when
testing for time-related functions and in libcurl, and don't bother
checking for it.
Closes #6859
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/curl-functions.m4 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 9691ed245..d49713df6 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -453,17 +453,11 @@ curl_includes_time="\ #endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> -# ifdef TIME_WITH_SYS_TIME -# include <time.h> -# endif -#else -# ifdef HAVE_TIME_H -# include <time.h> -# endif #endif +#include <time.h> /* includes end */" AC_CHECK_HEADERS( - sys/types.h sys/time.h time.h, + sys/types.h sys/time.h, [], [], [$curl_includes_time]) ]) |