Enable gnulib's <arpa/inet.h> replacement also when inet_ntop or inet_pton need to...

[gnulib.git] / m4 / inet_pton.m4

diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index dd8c318..4ea89d2 100644 (file)
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -1,18 +1,21 @@
-# inet_pton.m4 serial 1
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+# inet_pton.m4 serial 4
+dnl Copyright (C) 2006, 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,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_INET_PTON],
 [
+  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
+  ARPA_INET_H='arpa/inet.h'
+
   AC_REPLACE_FUNCS(inet_pton)
   gl_PREREQ_INET_PTON
 ])
 
-# Prerequisites of lib/inet_pton.h and lib/inet_pton.c.
+# Prerequisites of lib/inet_pton.c.
 AC_DEFUN([gl_PREREQ_INET_PTON], [
-  AC_CHECK_HEADERS_ONCE([netinet/in.h arpa/inet.h])
   AC_CHECK_DECLS([inet_pton],,,[#include <arpa/inet.h>])
   AC_REQUIRE([gl_SOCKET_FAMILIES])
+  AC_REQUIRE([AC_C_RESTRICT])
 ])