X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetaddrinfo.m4;h=c3671907842c2b4449a7c774032301353a86816c;hb=fa1340adb603e76d7cadfc6d1d6b68ea97e7f7b0;hp=006cdab2af81d6e0000872b1c865f30b1db9eb43;hpb=955a407e3c7dd91d6322a65747fb61403978c6a8;p=gnulib.git

diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 006cdab2a..c36719078 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 7
+# getaddrinfo.m4 serial 9
 dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,21 +11,23 @@ AC_DEFUN([gl_GETADDRINFO],
   AC_SEARCH_LIBS(getaddrinfo, [nsl socket])
   AC_CHECK_FUNCS(getaddrinfo,, [
     AC_CACHE_CHECK(for getaddrinfo in ws2tcpip.h and -lws2_32,
-                   gl_cv_w32_getaddrinfo, [
+		   gl_cv_w32_getaddrinfo, [
       gl_cv_w32_getaddrinfo=no
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -lws2_32"
       AC_TRY_LINK([
+#ifdef HAVE_WS2TCPIP_H
 #define WINVER 0x0501
 #include <ws2tcpip.h>
+#endif
 ], [getaddrinfo(0, 0, 0, 0);], gl_cv_w32_getaddrinfo=yes)
-      LIBS="$am_save_LIBS"
-      if test "$gl_cv_w32_getaddrinfo" = "yes"; then
-        LIBS="$LIBS -lws2_32"
-      else
-        AC_LIBOBJ(getaddrinfo)
-      fi
-    ])])
+    LIBS="$am_save_LIBS"])
+    if test "$gl_cv_w32_getaddrinfo" = "yes"; then
+      LIBS="$LIBS -lws2_32"
+    else
+      AC_LIBOBJ(getaddrinfo)
+    fi
+    ])
 
   AC_REPLACE_FUNCS(gai_strerror)
   gl_PREREQ_GETADDRINFO
@@ -37,9 +39,10 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
   AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet])
   AC_REQUIRE([gl_C_RESTRICT])
   AC_REQUIRE([gl_SOCKET_FAMILIES])
+  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_GNU_SOURCE])
-  AC_CHECK_HEADERS_ONCE(netinet/in.h sys/socket.h netdb.h ws2tcpip.h)
+  AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h)
   AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[
   /* sys/types.h is not needed according to POSIX, but the
      sys/socket.h in i386-unknown-freebsd4.10 and