diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-12-07 21:43:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-12-07 23:13:19 +0100 |
| commit | 0f00f2c33a85842a9611ed63f07e915ea9fd60de (patch) | |
| tree | a02ec2b230021798eb854693c6c9270c6a1f87e6 /m4/arpa_inet_h.m4 | |
| parent | cb26e97a88e90d04e6d4efe3de0de92dea53d1e5 (diff) | |
Use Gnulib's `nproc'.
This updates Gnulib to v0.0-4496-g6491120.
* m4/gnulib-cache.m4: Add `nproc'.
Diffstat (limited to 'm4/arpa_inet_h.m4')
| -rw-r--r-- | m4/arpa_inet_h.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index 15a30e2bc..80fdb406b 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -1,5 +1,5 @@ -# arpa_inet_h.m4 serial 8 -dnl Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc. +# arpa_inet_h.m4 serial 10 +dnl Copyright (C) 2006, 2008-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, dnl with or without modifications, as long as this notice is preserved. @@ -22,11 +22,13 @@ AC_DEFUN([gl_HEADER_ARPA_INET], dnl <arpa/inet.h> is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([arpa/inet.h]) + AC_REQUIRE([gl_FEATURES_H]) + dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[ /* On some systems, this header is not self-consistent. */ -#ifndef __GLIBC__ +#if !(defined __GLIBC__ || defined __UCLIBC__) # include <sys/socket.h> #endif #include <arpa/inet.h> |