X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fnetdb_h.m4;h=5a12251f9a1cdb1dcd9333fb4957654867af1bbc;hb=2f23fbb2ce253697930e8f769e13134f9be81363;hp=d6d729fbcfea146bf097eb0ad6c8a72eb1450336;hpb=ceb82aa30f0b017db4ffa03801dc29b7c82cbde0;p=gnulib.git

diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4
index d6d729fbc..5a12251f9 100644
--- a/m4/netdb_h.m4
+++ b/m4/netdb_h.m4
@@ -1,4 +1,4 @@
-# netdb_h.m4 serial 1
+# netdb_h.m4 serial 5
 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,22 @@ 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
-    NETDB_H=''
+  gl_CHECK_NEXT_HEADERS([netdb.h])
+  if test $ac_cv_header_netdb_h = yes; then
+    AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM([[
+         #include <netdb.h>
+         struct addrinfo a;
+         int b = EAI_OVERFLOW;
+         int c = AI_NUMERICSERV;
+       ]])],
+      [NETDB_H=''], [NETDB_H='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])
 ])
 
@@ -39,5 +35,11 @@ AC_DEFUN([gl_NETDB_MODULE_INDICATOR],
 
 AC_DEFUN([gl_NETDB_H_DEFAULTS],
 [
-  :
+  GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_STRUCT_ADDRINFO=1;   AC_SUBST([HAVE_STRUCT_ADDRINFO])
+  HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO])
+  HAVE_DECL_GAI_STRERROR=1; AC_SUBST([HAVE_DECL_GAI_STRERROR])
+  HAVE_DECL_GETADDRINFO=1;  AC_SUBST([HAVE_DECL_GETADDRINFO])
+  HAVE_DECL_GETNAMEINFO=1;  AC_SUBST([HAVE_DECL_GETNAMEINFO])
 ])