gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / netinet_in_h.m4

diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4
index 966bfe6..21971b2 100644 (file)
--- a/m4/netinet_in_h.m4
+++ b/m4/netinet_in_h.m4
@@ -1,5 +1,5 @@
-# netinet_in_h.m4 serial 2
-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# netinet_in_h.m4 serial 5
+dnl Copyright (C) 2006-2013 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.
@@ -9,7 +9,7 @@ AC_DEFUN([gl_HEADER_NETINET_IN],
   AC_CACHE_CHECK([whether <netinet/in.h> is self-contained],
     [gl_cv_header_netinet_in_h_selfcontained],
     [
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netinet/in.h>], [])],
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>]], [[]])],
         [gl_cv_header_netinet_in_h_selfcontained=yes],
         [gl_cv_header_netinet_in_h_selfcontained=no])
     ])
@@ -18,9 +18,7 @@ AC_DEFUN([gl_HEADER_NETINET_IN],
   else
     NETINET_IN_H='netinet/in.h'
     AC_CHECK_HEADERS([netinet/in.h])
-    gl_ABSOLUTE_HEADER([netinet/in.h])
-    ABSOLUTE_NETINET_IN_H=\"$gl_cv_absolute_netinet_in_h\"
-    AC_SUBST([ABSOLUTE_NETINET_IN_H])
+    gl_CHECK_NEXT_HEADERS([netinet/in.h])
     if test $ac_cv_header_netinet_in_h = yes; then
       HAVE_NETINET_IN_H=1
     else
@@ -29,4 +27,5 @@ AC_DEFUN([gl_HEADER_NETINET_IN],
     AC_SUBST([HAVE_NETINET_IN_H])
   fi
   AC_SUBST([NETINET_IN_H])
+  AM_CONDITIONAL([GL_GENERATE_NETINET_IN_H], [test -n "$NETINET_IN_H"])
 ])