diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | configure.ac | 86 |
2 files changed, 48 insertions, 44 deletions
@@ -7,6 +7,12 @@ Changelog +Daniel (2 October) +- James MacMillan's patch makes curl build on QNC 6.2.x. + +Daniel (26 September) +- My daughter was born! + Daniel (23 September) - Added support for -4/--ipv4 and -6/--ipv6 to force names to resolve to that particular IP version. They only work for IPv6-enabled libcurls. diff --git a/configure.ac b/configure.ac index 4479e2dc0..5b1400fb0 100644 --- a/configure.ac +++ b/configure.ac @@ -193,49 +193,6 @@ AC_HELP_STRING([--disable-telnet],[Disable TELNET support]), AC_MSG_RESULT(yes) ) - -dnl ********************************************************************** -dnl Checks for IPv6 -dnl ********************************************************************** - -AC_MSG_CHECKING([whether to enable ipv6]) -AC_ARG_ENABLE(ipv6, -AC_HELP_STRING([--enable-ipv6],[Enable ipv6 (with ipv4) support]) -AC_HELP_STRING([--disable-ipv6],[Disable ipv6 support]), -[ case "$enableval" in - no) - AC_MSG_RESULT(no) - ipv6=no - ;; - *) AC_MSG_RESULT(yes) - ipv6=yes - ;; - esac ], - - AC_TRY_RUN([ /* is AF_INET6 available? */ -#include <sys/types.h> -#include <sys/socket.h> -main() -{ - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) - exit(1); - else - exit(0); -} -], - AC_MSG_RESULT(yes) - ipv6=yes, - AC_MSG_RESULT(no) - ipv6=no, - AC_MSG_RESULT(no) - ipv6=no -)) - -if test "$ipv6" = "yes"; then - CURL_CHECK_WORKING_GETADDRINFO -fi - - dnl ********************************************************************** dnl Checks for libraries. dnl ********************************************************************** @@ -250,7 +207,7 @@ fi dnl At least one system has been identified to require BOTH nsl and dnl socket libs to link properly. -if test "$ac_cv_lib_nsl_gethostbyname" = "$ac_cv_func_gethostbyname"; then +if test "$ac_cv_lib_nsl_gethostbyname" != "yes" -a "$ac_cv_lib_socket_gethostbyname" != "yes" -a "$ac_cv_func_gethostbyname" != "yes"; then AC_MSG_CHECKING([trying both nsl and socket libs]) my_ac_save_LIBS=$LIBS LIBS="-lnsl -lsocket $LIBS" @@ -300,6 +257,47 @@ AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]), ) dnl ********************************************************************** +dnl Checks for IPv6 +dnl ********************************************************************** + +AC_MSG_CHECKING([whether to enable ipv6]) +AC_ARG_ENABLE(ipv6, +AC_HELP_STRING([--enable-ipv6],[Enable ipv6 (with ipv4) support]) +AC_HELP_STRING([--disable-ipv6],[Disable ipv6 support]), +[ case "$enableval" in + no) + AC_MSG_RESULT(no) + ipv6=no + ;; + *) AC_MSG_RESULT(yes) + ipv6=yes + ;; + esac ], + + AC_TRY_RUN([ /* is AF_INET6 available? */ +#include <sys/types.h> +#include <sys/socket.h> +main() +{ + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); + else + exit(0); +} +], + AC_MSG_RESULT(yes) + ipv6=yes, + AC_MSG_RESULT(no) + ipv6=no, + AC_MSG_RESULT(no) + ipv6=no +)) + +if test "$ipv6" = "yes"; then + CURL_CHECK_WORKING_GETADDRINFO +fi + +dnl ********************************************************************** dnl Check how non-blocking sockets are set dnl ********************************************************************** AC_ARG_ENABLE(nonblocking, |