James MacMillan's patch makes curl build on QNC 6.2.x.

This commit is contained in:
Daniel Stenberg 2003-10-02 19:04:32 +00:00
parent 588b63a05b
commit d1b17779a3
2 changed files with 48 additions and 44 deletions

View File

@ -7,6 +7,12 @@
Changelog 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) Daniel (23 September)
- Added support for -4/--ipv4 and -6/--ipv6 to force names to resolve to that - 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. particular IP version. They only work for IPv6-enabled libcurls.

View File

@ -193,49 +193,6 @@ AC_HELP_STRING([--disable-telnet],[Disable TELNET support]),
AC_MSG_RESULT(yes) 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 **********************************************************************
dnl Checks for libraries. dnl Checks for libraries.
dnl ********************************************************************** dnl **********************************************************************
@ -250,7 +207,7 @@ fi
dnl At least one system has been identified to require BOTH nsl and dnl At least one system has been identified to require BOTH nsl and
dnl socket libs to link properly. 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]) AC_MSG_CHECKING([trying both nsl and socket libs])
my_ac_save_LIBS=$LIBS my_ac_save_LIBS=$LIBS
LIBS="-lnsl -lsocket $LIBS" LIBS="-lnsl -lsocket $LIBS"
@ -299,6 +256,47 @@ AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]),
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) )
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 **********************************************************************
dnl Check how non-blocking sockets are set dnl Check how non-blocking sockets are set
dnl ********************************************************************** dnl **********************************************************************