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 40261c27e2b7b49c7101fa91679a71c1e12697d8..3c60a4e8ee39feb430375f2684b10c639fccf962 100644 (file)
--- 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 45aac4c7e9881d5c33f43f1228a58f44484541a5..a7b576088ed2c995e05ae5ad64df0354cac7b107 100644 (file)
--- 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 278859c6c29ecaaa45eb3dba12f82294b0a9fdda..17acf1547a341c3cf3cdb8387cd3fe7cc0cd26ea 100644 (file)
--- 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 29ef61394dc15eadaaaca1e995cb3c8e37a2c80d..69eb86efe1a20be590ec2a776715f0347ea7e759 100644 (file)
--- 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 501431f9d7cfd3fda0e7adeeb19b20f6f5fbf760..f1d696bd3d16ededa13eb13941b6585abd3cc6f4 100644 (file)
--- 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]