X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffileblocks.m4;h=bcd96bd6063ff0a1ff41c7bc5919b6425f18aeef;hb=466449b04ceeb8c245a7e364f9c2c812a5259c8f;hp=07e2b70eb3fb5e6d6361fa08ef4625e5e558acb6;hpb=53b8fa05726a7fb30010e42ce02e44a35f0d7489;p=gnulib.git

diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index 07e2b70eb..bcd96bd60 100644
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -1,21 +1,23 @@
-# fileblocks.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# fileblocks.m4 serial 6
+dnl Copyright (C) 2002, 2005-2006, 2009-2011 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_FILEBLOCKS],
 [
+  m4_pushdef([AC_LIBOBJ], [:])
+  dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ([fileblocks]).
   AC_STRUCT_ST_BLOCKS
-  dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ(fileblocks).
-  if test $ac_cv_member_struct_stat_st_blocks = no; then
-    gl_PREREQ_FILEBLOCKS
-  fi
+  m4_popdef([AC_LIBOBJ])
+  dnl The stat-size module depends on this one and also assumes that
+  dnl HAVE_STRUCT_STAT_ST_BLOCKS is correctly defined.  So if you
+  dnl remove the call above, please make sure that this does not
+  dnl introduce a bug into lib/stat-size.h.
 ])
 
 # Prerequisites of lib/fileblocks.c.
 AC_DEFUN([gl_PREREQ_FILEBLOCKS], [
-  AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
+  AC_CHECK_HEADERS_ONCE([sys/param.h])
+  :
 ])