diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-10-02 19:04:32 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-10-02 19:04:32 +0000 |
| commit | d1b17779a383a3719fd275f32e3c1f19b7a83e06 (patch) | |
| tree | 83bb61f0192afb4e6a345347c6de3c507ce4f898 /configure.ac | |
| parent | 588b63a05b7d82c0e1a9b2687820f3661608cd91 (diff) | |
James MacMillan's patch makes curl build on QNC 6.2.x.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 86 |
1 files changed, 42 insertions, 44 deletions
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, |