Fixes for netdb.h.

* m4/netdb_h.m4: Assume that if netdb.h exists, it works.
* lib/netdb.in.h: Fix typo.
Reported by Bruno Haible  <bruno@clisp.org>

* lib/netdb.in.h: Include sys/socket.h for platforms without
netdb.h, to get structures like hostent on MinGW.
* modules/netdb (Depends-on): Add sys_socket.

diff --git a/ChangeLog b/ChangeLog
index 721d69ec21ff156beb3f5f08f19621fe8ea35663..8d470e8a5821e3a5f34ce33f47e52d75d0f49804 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-16  Simon Josefsson  <simon@josefsson.org>
+
+       * m4/netdb_h.m4: Assume that if netdb.h exists, it works.
+       * lib/netdb.in.h: Fix typo.
+       Reported by Bruno Haible  <bruno@clisp.org>
+
+       * lib/netdb.in.h: Include sys/socket.h for platforms without
+       netdb.h, to get structures like hostent on MinGW.
+       * modules/netdb (Depends-on): Add sys_socket.
+
 2008-10-15  Simon Josefsson  <simon@josefsson.org>
 
        * modules/netdb, modules/netdb-tests: New file.

diff --git a/lib/netdb.in.h b/lib/netdb.in.h
index 0aa0691d5872369cfc432e2a407df5be1a3c186e..9a637f28f432fc013167f1b5e4f26918cfb27193 100644 (file)
--- a/lib/netdb.in.h
+++ b/lib/netdb.in.h
@@ -40,7 +40,10 @@
 
 #else
 
-/* Declarations for a platform that has <netdb.h>.  */
+/* Get netdb.h definitions such as struct hostent for MinGW.  */
+#include <sys/socket.h>
+
+/* Declarations for a platform that lacks <netdb.h>.  */
 
 #endif /* HAVE_NETDB_H */
 

diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4
index d6d729fbcfea146bf097eb0ad6c8a72eb1450336..8e8ff4aa72f6ed7940fd21587974fcbd01785675 100644 (file)
--- a/m4/netdb_h.m4
+++ b/m4/netdb_h.m4
@@ -1,4 +1,4 @@
-# netdb_h.m4 serial 1
+# netdb_h.m4 serial 2
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,26 +7,15 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_HEADER_NETDB],
 [
   AC_REQUIRE([gl_NETDB_H_DEFAULTS])
-  AC_CACHE_CHECK([whether <netdb.h> is self-contained],
-    [gl_cv_header_netdb_h_selfcontained],
-    [
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
-                                        [[struct hostent h;]])],
-        [gl_cv_header_netdb_h_selfcontained=yes],
-        [gl_cv_header_netdb_h_selfcontained=no])
-    ])
-  if test $gl_cv_header_netdb_h_selfcontained = yes; then
+  gl_CHECK_NEXT_HEADERS([netdb.h])
+  if test $ac_cv_header_netdb_h = yes; then
     NETDB_H=''
+    HAVE_NETDB_H=1
   else
     NETDB_H='netdb.h'
-    gl_CHECK_NEXT_HEADERS([netdb.h])
-    if test $ac_cv_header_netdb_h = yes; then
-      HAVE_NETDB_H=1
-    else
-      HAVE_NETDB_H=0
-    fi
-    AC_SUBST([HAVE_NETDB_H])
+    HAVE_NETDB_H=0
   fi
+  AC_SUBST([HAVE_NETDB_H])
   AC_SUBST([NETDB_H])
 ])
 

diff --git a/modules/netdb b/modules/netdb
index 21e4ff41bf336b425cf25083bab806ef98c634bc..3c2e9b4cd9576c540326a0b21f0811631e9ddf20 100644 (file)
--- a/modules/netdb
+++ b/modules/netdb
@@ -7,6 +7,7 @@ m4/netdb_h.m4
 
 Depends-on:
 include_next
+sys_socket
 
 configure.ac:
 gl_HEADER_NETDB