From ecfb73db2daf5f2d2babeae18785c0e850c8c685 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 25 Jul 2011 23:53:06 +0200
Subject: [PATCH] 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.
---
 ChangeLog    | 4 ++++
 m4/close.m4  | 3 ---
 m4/fclose.m4 | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5626264b5..ca420ae81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-25  Bruno Haible  <bruno@clisp.org>
 
+	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.
+
 	close: Move AC_LIBOBJ invocation to module description.
 	* m4/close.m4 (gl_REPLACE_CLOSE): Remove macro.
 	(gl_FUNC_CLOSE): Instead of gl_REPLACE_CLOSE, just set REPLACE_CLOSE to
diff --git a/m4/close.m4 b/m4/close.m4
index f2e1ac6f8..cd30d08cf 100644
--- a/m4/close.m4
+++ b/m4/close.m4
@@ -26,7 +26,4 @@ AC_DEFUN([gl_FUNC_CLOSE],
       fi
     fi
   ])
-  if test $REPLACE_CLOSE = 1; then
-    m4_ifdef([gl_REPLACE_FCLOSE], [gl_REPLACE_FCLOSE], [:])
-  fi
 ])
diff --git a/m4/fclose.m4 b/m4/fclose.m4
index 349b5f14c..32f2e26b7 100644
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -1,4 +1,4 @@
-# fclose.m4 serial 4
+# fclose.m4 serial 5
 dnl Copyright (C) 2008-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,6 +10,11 @@ AC_DEFUN([gl_FUNC_FCLOSE],
   if test $gl_cv_func_fflush_stdin = no; then
     gl_REPLACE_FCLOSE
   fi
+
+  AC_REQUIRE([gl_FUNC_CLOSE])
+  if test $REPLACE_CLOSE = 1; then
+    gl_REPLACE_FCLOSE
+  fi
 ])
 
 AC_DEFUN([gl_REPLACE_FCLOSE],
-- 
2.11.0