From: Bruno Haible <bruno@clisp.org>
Date: Thu, 5 May 2011 22:34:34 +0000 (+0200)
Subject: fclose, fflush: Respect rules for use of AC_LIBOBJ.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=864eeee51daf303bb48df9fcd64b59ea96b51c0e;p=pspp

fclose, fflush: Respect rules for use of AC_LIBOBJ.

* m4/fflush.m4 (gl_FUNC_FFLUSH): Don't invoke gl_REPLACE_FCLOSE.
* m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_FFLUSH_STDIN and
gl_REPLACE_FCLOSE here.
* modules/fflush (Depends-on): Remove fclose.
* doc/posix-functions/fclose.texi: Mention module 'fflush' only in
combination with module 'fclose'.
---

diff --git a/ChangeLog b/ChangeLog
index 40261c27e2..3c60a4e8ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-05  Bruno Haible  <bruno@clisp.org>
+
+	fclose, fflush: Respect rules for use of AC_LIBOBJ.
+	* m4/fflush.m4 (gl_FUNC_FFLUSH): Don't invoke gl_REPLACE_FCLOSE.
+	* m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_FFLUSH_STDIN and
+	gl_REPLACE_FCLOSE here.
+	* modules/fflush (Depends-on): Remove fclose.
+	* doc/posix-functions/fclose.texi: Mention module 'fflush' only in
+	combination with module 'fclose'.
+
 2011-05-05  Bruno Haible  <bruno@clisp.org>
 
 	fflush, fseeko: Respect rules for use of AC_LIBOBJ.
diff --git a/doc/posix-functions/fclose.texi b/doc/posix-functions/fclose.texi
index 45aac4c7e9..a7b576088e 100644
--- a/doc/posix-functions/fclose.texi
+++ b/doc/posix-functions/fclose.texi
@@ -6,7 +6,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/funct
 
 Gnulib module: fclose, fflush
 
-Portability problems fixed by Gnulib module @code{fflush}:
+Portability problems fixed by Gnulib module @code{fclose} together with module @code{fflush}:
 @itemize
 @item
 On some platforms, this function fails to set the file position of a
diff --git a/m4/fclose.m4 b/m4/fclose.m4
index 278859c6c2..17acf1547a 100644
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -1,4 +1,4 @@
-# fclose.m4 serial 2
+# fclose.m4 serial 3
 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,
@@ -6,6 +6,12 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_FCLOSE],
 [
+  m4_ifdef([gl_FUNC_FFLUSH_STDIN], [
+    gl_FUNC_FFLUSH_STDIN
+    if test $gl_cv_func_fflush_stdin = no; then
+      gl_REPLACE_FCLOSE
+    fi
+  ])
 ])
 
 AC_DEFUN([gl_REPLACE_FCLOSE],
diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 29ef61394d..69eb86efe1 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,4 +1,4 @@
-# fflush.m4 serial 10
+# fflush.m4 serial 11
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -15,7 +15,6 @@ AC_DEFUN([gl_FUNC_FFLUSH],
   gl_FUNC_FFLUSH_STDIN
   if test $gl_cv_func_fflush_stdin = no; then
     gl_REPLACE_FFLUSH
-    gl_REPLACE_FCLOSE
   fi
 ])
 
diff --git a/modules/fflush b/modules/fflush
index 501431f9d7..f1d696bd3d 100644
--- a/modules/fflush
+++ b/modules/fflush
@@ -8,7 +8,6 @@ m4/fflush.m4
 
 Depends-on:
 stdio
-fclose
 fpurge          [test $REPLACE_FFLUSH = 1]
 ftello          [test $REPLACE_FFLUSH = 1]
 freading        [test $REPLACE_FFLUSH = 1]