Mercurial > hg > octave-nkf > gnulib-hg
changeset 10646:75ed7420a5bf
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.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Thu, 16 Oct 2008 09:26:07 +0200 |
| parents | 9b742ec50416 |
| children | 038e7a58c9c8 |
| files | ChangeLog lib/netdb.in.h m4/netdb_h.m4 modules/netdb |
| diffstat | 4 files changed, 21 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 */
--- 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 @@ 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]) ])