--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-07  Bruno Haible  <bruno@clisp.org>
+
+	fseek: Move AC_LIBOBJ invocations to module description.
+	* m4/fseek.m4 (gl_REPLACE_FSEEK): Remove macro.
+	(gl_FUNC_FSEEK): Inline it here. Move AC_LIBOBJ invocation from here...
+	* modules/fseek (configure.ac): ... to here.
+
 2011-05-07  Bruno Haible  <bruno@clisp.org>
 
 	fseek: Respect rules for use of AC_LIBOBJ.

--- a/m4/fseek.m4
+++ b/m4/fseek.m4
@@ -1,4 +1,4 @@
-# fseek.m4 serial 3
+# fseek.m4 serial 4
 dnl Copyright (C) 2007, 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,
@@ -10,13 +10,6 @@
   AC_REQUIRE([gl_FUNC_FSEEKO])
   dnl When fseeko needs fixes, fseek needs them too.
   if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
-    gl_REPLACE_FSEEK
+    REPLACE_FSEEK=1
   fi
 ])
-
-AC_DEFUN([gl_REPLACE_FSEEK],
-[
-  AC_LIBOBJ([fseek])
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  REPLACE_FSEEK=1
-])

--- a/modules/fseek
+++ b/modules/fseek
@@ -11,6 +11,9 @@
 
 configure.ac:
 gl_FUNC_FSEEK
+if test $REPLACE_FSEEK = 1; then
+  AC_LIBOBJ([fseek])
+fi
 gl_STDIO_MODULE_INDICATOR([fseek])
 
 Makefile.am: