gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / fileblocks.m4

diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index 8700eda..d1abd30 100644 (file)
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -1,20 +1,19 @@
-# fileblocks.m4 serial 5
-dnl Copyright (C) 2002, 2005-2006, 2009-2011 Free Software Foundation, Inc.
+# fileblocks.m4 serial 6
+dnl Copyright (C) 2002, 2005-2006, 2009-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.
 
 AC_DEFUN([gl_FILEBLOCKS],
 [
-  AC_STRUCT_ST_BLOCKS
+  m4_pushdef([AC_LIBOBJ], [:])
   dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ([fileblocks]).
+  AC_STRUCT_ST_BLOCKS
+  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.
-  if test $ac_cv_member_struct_stat_st_blocks = no; then
-    gl_PREREQ_FILEBLOCKS
-  fi
 ])
 
 # Prerequisites of lib/fileblocks.c.