Mercurial > hg > octave-lyh > gnulib-hg

changeset 13236:3421d6e36cbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Override netdb.h always.
author Bruno Haible <bruno@clisp.org>
date Fri, 16 Apr 2010 18:43:00 +0200
parents a068c8f101e6
children 15f9d5da394d
files ChangeLog m4/netdb_h.m4 modules/netdb
diffstat 3 files changed, 9 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-16  Bruno Haible  <bruno@clisp.org>
+
+	Override netdb.h always.
+	* modules/netdb (Makefile.am): Augment BUILT_SOURCES always.
+	* m4/netdb_h.m4 (gl_HEADER_NETDB): Don't set NETDB_H.
+	Reported by Ludovic Courtès <ludo@gnu.org>.
+
 2010-04-15  Bruno Haible  <bruno@clisp.org>
 
 	openpty: Fix mistake from 2010-03-21.
--- a/m4/netdb_h.m4
+++ b/m4/netdb_h.m4
@@ -1,4 +1,4 @@
-# netdb_h.m4 serial 7
+# netdb_h.m4 serial 8
 dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,21 +10,11 @@
   AC_CHECK_HEADERS_ONCE([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'
     HAVE_NETDB_H=0
   fi
   AC_SUBST([HAVE_NETDB_H])
-  AC_SUBST([NETDB_H])
 ])
 
 AC_DEFUN([gl_NETDB_MODULE_INDICATOR],
--- a/modules/netdb
+++ b/modules/netdb
@@ -14,7 +14,7 @@
 gl_HEADER_NETDB
 
 Makefile.am:
-BUILT_SOURCES += $(NETDB_H)
+BUILT_SOURCES += netdb.h
 
 # We need the following in order to create <netdb.h> when the system
 # doesn't have one that works with the given compiler.