From 084dd2051456f1905e5e3145d2c322f08ef12403 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Wed, 26 Nov 2003 14:46:13 -0800
Subject: [PATCH] [svn] Don't check for AI_V4MAPPED and AI_ALL.

---
 ChangeLog    |  3 +++
 aclocal.m4   | 47 +----------------------------------------------
 configure.in | 12 ------------
 3 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9bce048..40af815e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-11-26  Hrvoje Niksic  <hniksic@xemacs.org>
 
+	* aclocal.m4: Don't check for AI_V4MAPPED and for AI_ALL, since
+	Wget doesn't need them.
+
 	* configure.in: Check for struct sockaddr_storage.
 
 2003-11-12  Hrvoje Niksic  <hniksic@xemacs.org>
diff --git a/aclocal.m4 b/aclocal.m4
index 69a5a748..9a2a0666 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -246,7 +246,7 @@ AC_DEFUN([GETADDRINFO_AI_ADDRCONFIG],[
 #include <netdb.h>
 
 #ifndef AI_ADDRCONFIG
-#error Missing AI_ADDRCONFIG
+ #error Missing AI_ADDRCONFIG
 #endif
     ],[
       wget_cv_gai_ai_addrconfig=yes
@@ -263,51 +263,6 @@ AC_DEFUN([GETADDRINFO_AI_ADDRCONFIG],[
 ])
 
 
-AC_DEFUN([GETADDRINFO_AI_ALL],[
-  AC_CACHE_CHECK([if getaddrinfo supports AI_ALL],[wget_cv_gai_ai_all],[
-    AC_TRY_CPP([
-#include <netdb.h>
-
-#ifndef AI_ALL
-#error Missing AI_ALL
-#endif
-    ],[
-      wget_cv_gai_ai_all=yes
-    ],[
-      wget_cv_gai_ai_all=no
-    ])
-  ])
-
-  if test "X$wget_cv_gai_ai_all" = "Xyes"; then :
-    $1
-  else :
-    $2
-  fi
-])
-
-
-AC_DEFUN([GETADDRINFO_AI_V4MAPPED],[
-  AC_CACHE_CHECK([if getaddrinfo supports AI_V4MAPPED],[wget_cv_gai_ai_v4mapped],[
-    AC_TRY_CPP([
-#include <netdb.h>
-
-#ifndef AI_V4MAPPED
-#error Missing AI_V4MAPPED
-#endif
-    ],[
-      wget_cv_gai_ai_v4mapped=yes
-    ],[
-      wget_cv_gai_ai_v4mapped=no
-    ])
-  ])
-
-  if test "X$wget_cv_gai_ai_v4mapped" = "Xyes"; then :
-    $1
-  else :
-    $2
-  fi
-])
-
 AC_DEFUN([WGET_STRUCT_SOCKADDR_STORAGE],[
   AC_CHECK_TYPES([struct sockaddr_storage],[], [], [
 #include <sys/types.h>
diff --git a/configure.in b/configure.in
index 98e3b1ef..beb3ae4c 100644
--- a/configure.in
+++ b/configure.in
@@ -491,18 +491,6 @@ if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
         [Define if the system headers support the AI_ADDRCONFIG flag.]
       )
     ])
-    GETADDRINFO_AI_V4MAPPED([
-      AC_DEFINE(
-        [HAVE_GETADDRINFO_AI_V4MAPPED], 1, 
-        [Define if the system headers support the AI_V4MAPPED flag.]
-      )
-    ])
-    GETADDRINFO_AI_ALL([
-      AC_DEFINE(
-        [HAVE_GETADDRINFO_AI_ALL], 1, 
-        [Define if the system headers support the AI_ALL flag.]
-      )
-    ])
   ], [
     AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)])
     ipv6=no