github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2024-12-28 22:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn] Don't set ipv6 to yes only because struct sockaddr_in6 was found. Stop the

Browse Source 
rest of the IPv6 checks when one check fails.  Abort if IPv6 was explicitly
requested, but not found.
This commit is contained in:
hniksic 2005-04-29 05:17:25 -07:00
parent 2051e4792e
commit 72fc6002d8
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-04-29 Hrvoje Niksic <hniksic@xemacs.org>
* configure.in: Don't set ipv6 to yes only because struct
sockaddr_in6 was found. Stop the rest of the IPv6 checks when one
check fails. Abort if IPv6 was explicitly requested, but not
found.
2005-04-28 Hrvoje Niksic <hniksic@xemacs.org> 2005-04-28 Hrvoje Niksic <hniksic@xemacs.org>
* windows/Makefile.top.bor: Use MAKEDIR for make clean too. * windows/Makefile.top.bor: Use MAKEDIR for make clean too.

49
configure.in
View File

@ -508,45 +508,54 @@ dnl **********************************************************************
dnl dnl
dnl If --enable-ipv6 is specified, we try to use IPv6 (as long as dnl If --enable-ipv6 is specified, we try to use IPv6 (as long as
dnl getaddrinfo is also present). If --disable-ipv6 is specified, we dnl getaddrinfo is also present). If --disable-ipv6 is specified, we
dnl don't use IPv6 or getaddrinfo. dnl don't use IPv6 or getaddrinfo. Otherwise we detect IPv6 and use
dnl it where available.
dnl dnl
ipv6=
check_for_ipv6=no
AC_ARG_ENABLE(ipv6, AC_ARG_ENABLE(ipv6,
AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]),
[case "${enable_ipv6}" in [case "${enable_ipv6}" in
no) no)
AC_MSG_NOTICE([disabling IPv6 at user request]) AC_MSG_NOTICE([disabling IPv6 at user request])
ipv6=no dnl Disable IPv6 checking
;; ipv6=no
*) ;;
yes)
dnl IPv6 explicitly enabled: force its use (abort if unavailable).
ipv6=yes
force_ipv6=yes
;;
auto)
dnl Auto-detect IPv6, i.e. check for IPv6, but don't force it.
ipv6=yes
;;
*)
AC_MSG_ERROR([Invalid --enable-ipv6 argument \`$enable_ipv6'])
;;
esac
], [
dnl If nothing is specified, assume auto-detection.
ipv6=yes ipv6=yes
;; ]
esac],
dnl If unspecified, check for IPv6 and use it where available.
[check_for_ipv6=yes]
) )
if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then if test "X$ipv6" = "Xyes"; then
AC_CHECK_FUNCS(getaddrinfo, [], [ AC_CHECK_FUNCS(getaddrinfo, [], [
AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)]) AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)])
ipv6=no ipv6=no
]) ])
fi fi
if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then if test "X$ipv6" = "Xyes"; then
PROTO_INET6([], [ PROTO_INET6([], [
AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family]) AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family])
ipv6=no ipv6=no
]) ])
fi fi
if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then if test "X$ipv6" = "Xyes"; then
TYPE_STRUCT_SOCKADDR_IN6([ TYPE_STRUCT_SOCKADDR_IN6([],[
ipv6=yes AC_MSG_NOTICE([Disabling IPv6 support: your system does not support \`struct sockaddr_in6'])
],[
AC_MSG_NOTICE([Disabling IPv6 support: your system does not support 'struct sockaddr_in6'])
ipv6=no ipv6=no
]) ])
if test "X$ipv6" = "Xyes"; then if test "X$ipv6" = "Xyes"; then
@ -557,6 +566,8 @@ fi
if test "X$ipv6" = "Xyes"; then if test "X$ipv6" = "Xyes"; then
AC_DEFINE([ENABLE_IPV6], 1, [Define if IPv6 support is enabled.]) AC_DEFINE([ENABLE_IPV6], 1, [Define if IPv6 support is enabled.])
elif test "x$force_ipv6" = "xyes"; then
AC_MSG_ERROR([IPv6 support requested but not found; aborting])
fi fi