X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsys_file_h.m4;h=ad78efb9c438fbacab6183bfc103a218d034ce78;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=d864dad3ec1733eb0c1c802d9e5c03efd959052a;hpb=cbd5934b1918d73022d1d1d9904112f3d6d7f187;p=gnulib.git

diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4
index d864dad3e..ad78efb9c 100644
--- a/m4/sys_file_h.m4
+++ b/m4/sys_file_h.m4
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/file.h>.
-# serial 3
+# serial 6
 
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 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.
@@ -12,13 +12,9 @@ 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])
 
-  AC_CHECK_HEADERS_ONCE([sys/file.h])
   if test $ac_cv_header_sys_file_h = yes; then
     HAVE_SYS_FILE_H=1
   else
@@ -35,7 +31,7 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H],
 AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR],
 [
   AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS])
-  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
 ])
 
 AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS],