[svn] Renamed DEBUG to ENABLE_DEBUG.

[wget] / configure.in

diff --git a/configure.in b/configure.in
index c1c781b8ca3c405dcfa0f4412a57f3471d6f548f..3476f89ecbb8c8e25297863bc31e84aa91fd61d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -71,8 +71,8 @@ test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
 
 AC_ARG_ENABLE(debug,
 [  --disable-debug         disable support for debugging output],
-DEBUG=$enableval, DEBUG=yes)
-test x"${DEBUG}" = xyes && AC_DEFINE(DEBUG)
+ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
+test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
 
 wget_need_md5=no
 
@@ -445,14 +445,6 @@ dnl **********************************************************************
 dnl Checks for IPv6
 dnl **********************************************************************
 
-dnl
-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 don't use IPv6 or getaddrinfo.  If neither are specified, we test
-dnl whether it's possible to create an AF_INET6 socket and if yes, use
-dnl IPv6.
-dnl
-
 ipv6=
 check_for_ipv6=no
 AC_ARG_ENABLE(ipv6,
@@ -466,12 +458,11 @@ AC_ARG_ENABLE(ipv6,
     ipv6=yes
     ;;
   esac],
-  [check_for_ipv6=yes]
+  [check_for_ipv6=no]
 )
 
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
-  AC_CHECK_FUNC(getaddrinfo,[
-    AC_DEFINE([HAVE_GETADDRINFO], 1)
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
+  AC_CHECK_FUNCS(getaddrinfo,[
     GETADDRINFO_AI_ADDRCONFIG(
       AC_DEFINE(
         [HAVE_GETADDRINFO_AI_ADDRCONFIG], 1, 
@@ -496,14 +487,14 @@ if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
   ])
 fi
   
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
   PROTO_INET6(,[
     AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family])
     ipv6=no
   ])
 fi
 
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
   TYPE_STRUCT_SOCKADDR_IN6([
     ipv6=yes
   ],[