Index: m4/getaddrinfo.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getaddrinfo.m4,v
retrieving revision 1.18
diff -u -p -r1.18 getaddrinfo.m4
--- m4/getaddrinfo.m4	9 Aug 2006 22:52:40 -0000	1.18
+++ m4/getaddrinfo.m4	17 Jan 2007 13:55:06 -0000
@@ -58,7 +58,7 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h)
-  AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror, getnameinfo],,,[
+  AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, getnameinfo],,,[
   /* sys/types.h is not needed according to POSIX, but the
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
Index: lib/getaddrinfo.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getaddrinfo.h,v
retrieving revision 1.18
diff -u -p -r1.18 getaddrinfo.h
--- lib/getaddrinfo.h	22 Jul 2006 10:13:57 -0000	1.18
+++ lib/getaddrinfo.h	17 Jan 2007 13:55:06 -0000
@@ -126,12 +126,14 @@ extern int getaddrinfo (const char *rest
 extern void freeaddrinfo (struct addrinfo *ai);
 #endif
 
-#if !HAVE_DECL_GAI_STRERROR
+
 /* Convert error return from getaddrinfo() to a string.
    For more details, see the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/gai_strerror.html>.  */
+#undef gai_strerror
+#define gai_strerror rpl_gail_strerror
+
 extern const char *gai_strerror (int ecode);
-#endif
 
 #if !HAVE_DECL_GETNAMEINFO
 /* Convert socket address to printable node and service names.