diff options
| author | Nils Gillmann <ng0@n0.is> | 2018-08-05 10:00:26 +0000 |
|---|---|---|
| committer | Nils Gillmann <ng0@n0.is> | 2018-08-05 10:00:26 +0000 |
| commit | e811856677be94017c4d2bb333830a7f743649a6 (patch) | |
| tree | 1483daf2649cd4da1db8b10218c5756965839512 /configure.ac | |
| parent | cb5937f5c0669fee3f8c3d4e1f9d640f592d91fa (diff) | |
| parent | eb8138405a3f747f2c236464932f72e918946f68 (diff) | |
| download | gnurl-e811856677be94017c4d2bb333830a7f743649a6.tar.gz gnurl-e811856677be94017c4d2bb333830a7f743649a6.tar.bz2 gnurl-e811856677be94017c4d2bb333830a7f743649a6.zip | |
Merge tag 'curl-7_61_0'
curl 7.61.0
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 0e3803ac0..b21dd584f 100755 --- a/configure.ac +++ b/configure.ac @@ -188,7 +188,8 @@ AC_CANONICAL_HOST dnl Get system canonical name AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS]) -dnl Checks for programs. +# Silence warning: ar: 'u' modifier ignored since 'D' is the default +AC_SUBST(AR_FLAGS, [cr]) dnl This defines _ALL_SOURCE for AIX CURL_CHECK_AIX_ALL_SOURCE @@ -2311,16 +2312,16 @@ AC_HEADER_TIME CURL_CHECK_STRUCT_TIMEVAL CURL_VERIFY_RUNTIMELIBS -AC_CHECK_SIZEOF(size_t) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(time_t) -AC_CHECK_SIZEOF(off_t) +AX_COMPILE_CHECK_SIZEOF(size_t) +AX_COMPILE_CHECK_SIZEOF(long) +AX_COMPILE_CHECK_SIZEOF(int) +AX_COMPILE_CHECK_SIZEOF(short) +AX_COMPILE_CHECK_SIZEOF(time_t) +AX_COMPILE_CHECK_SIZEOF(off_t) o=$CPPFLAGS CPPFLAGS="-I$srcdir/include $CPPFLAGS" -AC_CHECK_SIZEOF(curl_off_t, unused , [ +AX_COMPILE_CHECK_SIZEOF(curl_off_t, [ #include <gnurl/system.h> ]) CPPFLAGS=$o @@ -2477,7 +2478,13 @@ case $host in ;; esac -AC_CHECK_FUNCS([geteuid \ +AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Set if getpwuid_r() declaration is missing")], + [[#include <pwd.h> + #include <sys/types.h>]]) + + +AC_CHECK_FUNCS([fnmatch \ + geteuid \ getpass_r \ getppid \ getpwuid \ @@ -2514,17 +2521,12 @@ AC_CHECK_FUNCS([geteuid \ fi ]) -dnl Check if the getnameinfo function is available -dnl and get the types of five of its arguments. -CURL_CHECK_FUNC_GETNAMEINFO - if test "$ipv6" = "yes"; then if test "$curl_cv_func_getaddrinfo" = "yes"; then AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support]) IPV6_ENABLED=1 AC_SUBST(IPV6_ENABLED) fi - CURL_CHECK_NI_WITHSCOPEID fi CURL_CHECK_NONBLOCKING_SOCKET |