X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fsys_file_h.m4;h=fac106a092365dab194f70af5fdb0fd96074b2f0;hb=062cad2d07081f9a60adbb90fc1184a435a1a93f;hp=436c6fec14f28e35e9e338ad0a0c3b5e0a5f8816;hpb=e69247d77e183da8d4d1d20e8993933aa420cbca;p=gnulib.git

diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4
index 436c6fec1..fac106a09 100644
--- a/m4/sys_file_h.m4
+++ b/m4/sys_file_h.m4
@@ -1,6 +1,7 @@
 # Configure a replacement for <sys/file.h>.
+# serial 4
 
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,13 +12,8 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H],
 [
   AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS])
 
-  dnl Only flock is defined in a working <sys/file.h>.  If that
-  dnl function is already there, we don't want to do any substitution.
-  AC_CHECK_FUNCS_ONCE([flock])
-
+  dnl <sys/file.h> is always overridden, because of GNULIB_POSIXCHECK.
   gl_CHECK_NEXT_HEADERS([sys/file.h])
-  SYS_FILE_H='sys/file.h'
-  AC_SUBST([SYS_FILE_H])
 
   AC_CHECK_HEADERS_ONCE([sys/file.h])
   if test $ac_cv_header_sys_file_h = yes; then
@@ -26,6 +22,11 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H],
     HAVE_SYS_FILE_H=0
   fi
   AC_SUBST([HAVE_SYS_FILE_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([[#include <sys/file.h>
+    ]], [flock])
 ])
 
 AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR],