--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-07  Bruno Haible  <bruno@clisp.org>
+
+	fseek: Respect rules for use of AC_LIBOBJ.
+	* m4/fseeko.m4 (gl_FUNC_FSEEKO): Move gl_REPLACE_FSEEK invocation from
+	here...
+	* m4/fseek.m4 (gl_FUNC_FSEEK): ... to here.
+
 2011-05-07  Bruno Haible  <bruno@clisp.org>
 
 	fseeko: Respect rules for use of AC_LIBOBJ.

--- a/m4/fseek.m4
+++ b/m4/fseek.m4
@@ -1,4 +1,4 @@
-# fseek.m4 serial 2
+# fseek.m4 serial 3
 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,
@@ -9,7 +9,9 @@
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_FSEEKO])
   dnl When fseeko needs fixes, fseek needs them too.
-  dnl gl_FUNC_FSEEKO takes care of calling gl_REPLACE_FSEEK
+  if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
+    gl_REPLACE_FSEEK
+  fi
 ])
 
 AC_DEFUN([gl_REPLACE_FSEEK],

--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -1,4 +1,4 @@
-# fseeko.m4 serial 13
+# fseeko.m4 serial 14
 dnl Copyright (C) 2007-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,
@@ -28,10 +28,6 @@
       fi
     ])
   fi
-  if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
-    dnl If we are also using the fseek module, then fseek needs replacing, too.
-    m4_ifdef([gl_REPLACE_FSEEK], [gl_REPLACE_FSEEK])
-  fi
 ])
 
 dnl Tests whether fseeko is available.