fflush, fseeko: Respect rules for use of AC_LIBOBJ.

* m4/fflush.m4 (gl_FUNC_FFLUSH_STDIN): New macro, extracted from
gl_FUNC_FFLUSH.
(gl_FUNC_FFLUSH): Use it.
(gl_REPLACE_FFLUSH): Don't invoke gl_REPLACE_FSEEKO.
* m4/fseeko.m4 (gl_FUNC_FSEEKO): Invoke gl_FUNC_FFLUSH_STDIN and
gl_REPLACE_FSEEKO here.

diff --git a/ChangeLog b/ChangeLog
index 3ec1af5360aac53b1432556375d32ffc13386561..40261c27e2b7b49c7101fa91679a71c1e12697d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-05  Bruno Haible  <bruno@clisp.org>
+
+       fflush, fseeko: Respect rules for use of AC_LIBOBJ.
+       * m4/fflush.m4 (gl_FUNC_FFLUSH_STDIN): New macro, extracted from
+       gl_FUNC_FFLUSH.
+       (gl_FUNC_FFLUSH): Use it.
+       (gl_REPLACE_FFLUSH): Don't invoke gl_REPLACE_FSEEKO.
+       * m4/fseeko.m4 (gl_FUNC_FSEEKO): Invoke gl_FUNC_FFLUSH_STDIN and
+       gl_REPLACE_FSEEKO here.
+
 2011-05-05  Bruno Haible  <bruno@clisp.org>
 
        tzset: Relicense under LGPL.

diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 08b9f17d302002d1930c556a8b16e274fc1ddbf7..29ef61394dc15eadaaaca1e995cb3c8e37a2c80d 100644 (file)
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,4 +1,4 @@
-# fflush.m4 serial 9
+# fflush.m4 serial 10
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -11,6 +11,18 @@ dnl Find out how to obey POSIX semantics of fflush(stdin) discarding
 dnl unread input on seekable streams, rather than C99 undefined semantics.
 
 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
+])
+
+dnl Determine whether fflush works on input streams.
+dnl Sets gl_cv_func_fflush_stdin.
+
+AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
 [
   AC_CACHE_CHECK([whether fflush works on input streams],
     [gl_cv_func_fflush_stdin],
@@ -59,10 +71,6 @@ AC_DEFUN([gl_FUNC_FFLUSH],
       gl_cv_func_fflush_stdin=no])
      rm conftest.txt
     ])
-  if test $gl_cv_func_fflush_stdin = no; then
-    gl_REPLACE_FFLUSH
-    gl_REPLACE_FCLOSE
-  fi
 ])
 
 AC_DEFUN([gl_REPLACE_FFLUSH],
@@ -71,7 +79,6 @@ AC_DEFUN([gl_REPLACE_FFLUSH],
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   REPLACE_FFLUSH=1
   gl_PREREQ_FFLUSH
-  gl_REPLACE_FSEEKO
 ])
 
 # Prerequisites of lib/fflush.c.

diff --git a/m4/fseeko.m4 b/m4/fseeko.m4
index 76507d128f0e754ca20a7414e1b6deecf0aa5a75..28da81b1ccf5675e58978b020d05cabd0d1f31d1 100644 (file)
--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -1,4 +1,4 @@
-# fseeko.m4 serial 11
+# fseeko.m4 serial 12
 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,
@@ -23,6 +23,12 @@ AC_DEFUN([gl_FUNC_FSEEKO],
       gl_REPLACE_FSEEKO
     fi
   fi
+  m4_ifdef([gl_FUNC_FFLUSH_STDIN], [
+    gl_FUNC_FFLUSH_STDIN
+    if test $gl_cv_func_fflush_stdin = no; then
+      gl_REPLACE_FSEEKO
+    fi
+  ])
 ])
 
 dnl Tests whether fseeko is available.