fclose: Move AC_LIBOBJ invocation to module description.

* m4/fclose.m4 (gl_REPLACE_FCLOSE): Remove macro.
(gl_FUNC_FCLOSE): Instead of gl_REPLACE_FCLOSE, just set REPLACE_FCLOSE
to 1.
* modules/fclose (configure.ac): Invoke AC_LIBOBJ.

diff --git a/ChangeLog b/ChangeLog
index ca420ae8136b4fd95d6125792e1e0d138437f941..4eff46f3b3084df209c3e3bc034150e22a8d0ce8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-07-25  Bruno Haible  <bruno@clisp.org>
 
+       fclose: Move AC_LIBOBJ invocation to module description.
+       * m4/fclose.m4 (gl_REPLACE_FCLOSE): Remove macro.
+       (gl_FUNC_FCLOSE): Instead of gl_REPLACE_FCLOSE, just set REPLACE_FCLOSE
+       to 1.
+       * modules/fclose (configure.ac): Invoke AC_LIBOBJ.
+
        fclose: Remove call-in from close.m4.
        * m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_CLOSE.
        * m4/close.m4 (gl_FUNC_CLOSE): Don't invoke gl_REPLACE_FCLOSE.

diff --git a/m4/fclose.m4 b/m4/fclose.m4
index 32f2e26b7aa601b6aa6bab194df51027190ae5b2..92fa07213d0fc19e1c36367f3355a75e3b0fc7cb 100644 (file)
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -6,20 +6,15 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_FCLOSE],
 [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+
   gl_FUNC_FFLUSH_STDIN
   if test $gl_cv_func_fflush_stdin = no; then
-    gl_REPLACE_FCLOSE
+    REPLACE_FCLOSE=1
   fi
 
   AC_REQUIRE([gl_FUNC_CLOSE])
   if test $REPLACE_CLOSE = 1; then
-    gl_REPLACE_FCLOSE
+    REPLACE_FCLOSE=1
   fi
 ])
-
-AC_DEFUN([gl_REPLACE_FCLOSE],
-[
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  REPLACE_FCLOSE=1
-  AC_LIBOBJ([fclose])
-])

diff --git a/modules/fclose b/modules/fclose
index e6493c908a6ac5f32ea35f5e6ed769f6206a9843..85f63fe448046f9f5a571b027318a444b6767145 100644 (file)
--- a/modules/fclose
+++ b/modules/fclose
@@ -14,6 +14,9 @@ lseek           [test $REPLACE_FCLOSE = 1]
 
 configure.ac:
 gl_FUNC_FCLOSE
+if test $REPLACE_FCLOSE = 1; then
+  AC_LIBOBJ([fclose])
+fi
 gl_STDIO_MODULE_INDICATOR([fclose])
 
 Makefile.am: