changeset 14939:c400cbc2e1e5

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.
author Bruno Haible <bruno@clisp.org>
date Sat, 07 May 2011 12:02:05 +0200
parents e45dcf244493
children edad1aa593fe
files ChangeLog m4/fileblocks.m4 modules/fileblocks
diffstat 3 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 @@
 
 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]).
+  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.
--- a/modules/fileblocks
+++ b/modules/fileblocks
@@ -9,6 +9,10 @@
 
 configure.ac:
 gl_FILEBLOCKS
+if test $ac_cv_member_struct_stat_st_blocks = no; then
+  AC_LIBOBJ([fileblocks])
+  gl_PREREQ_FILEBLOCKS
+fi
 
 Makefile.am: