fileblocks: Move AC_LIBOBJ invocations to module description.

* m4/fileblocks.m4 (gl_FILEBLOCKS): Move AC_LIBOBJ and
gl_PREREQ_FILEBLOCKS invocations from here...
* modules/fileblocks (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 4a50443496da69091bc3fcebedf55eedd2e089e8..a7e19738ef01a67058a106bc7a3f431ae19a2a3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-07  Bruno Haible  <bruno@clisp.org>
+
+       fileblocks: Move AC_LIBOBJ invocations to module description.
+       * m4/fileblocks.m4 (gl_FILEBLOCKS): Move AC_LIBOBJ and
+       gl_PREREQ_FILEBLOCKS invocations from here...
+       * modules/fileblocks (configure.ac): ... to here.
+
 2011-05-06  Bruno Haible  <bruno@clisp.org>
 
        fflush: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index 8700edaef124ed592499663935361d7ca69a081e..bcd96bd6063ff0a1ff41c7bc5919b6425f18aeef 100644 (file)
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -1,4 +1,4 @@
-# fileblocks.m4 serial 5
+# 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,
@@ -6,15 +6,14 @@ 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.

diff --git a/modules/fileblocks b/modules/fileblocks
index e919301e79276cc272964bffc393badded481205..2deff815ee179cf9b55e1860dca898ace5342ffe 100644 (file)
--- a/modules/fileblocks
+++ b/modules/fileblocks
@@ -9,6 +9,10 @@ Depends-on:
 
 configure.ac:
 gl_FILEBLOCKS
+if test $ac_cv_member_struct_stat_st_blocks = no; then
+  AC_LIBOBJ([fileblocks])
+  gl_PREREQ_FILEBLOCKS
+fi
 
 Makefile.am: