fclose: Simplify autoconf macro.

* m4/fclose.m4 (gl_FUNC_FCLOSE): Assume gl_FUNC_FFLUSH_STDIN is
defined.

diff --git a/ChangeLog b/ChangeLog
index e1f70a04cd609bf5ca7c27dedd6f0b5029edba13..c84262bc4cbfd7661ac03178597239dcccd2d24c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-07  Bruno Haible  <bruno@clisp.org>
+
+       fclose: Simplify autoconf macro.
+       * m4/fclose.m4 (gl_FUNC_FCLOSE): Assume gl_FUNC_FFLUSH_STDIN is
+       defined.
+
 2011-05-07  Bruno Haible  <bruno@clisp.org>
 
        canonicalize-lgpl: Fix autoconf macro ordering bug.

diff --git a/m4/fclose.m4 b/m4/fclose.m4
index 17acf1547a341c3cf3cdb8387cd3fe7cc0cd26ea..349b5f14c4024331cca275c8ffdccb9edb835f81 100644 (file)
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -1,4 +1,4 @@
-# fclose.m4 serial 3
+# fclose.m4 serial 4
 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,12 +6,10 @@ 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
-  ])
+  gl_FUNC_FFLUSH_STDIN
+  if test $gl_cv_func_fflush_stdin = no; then
+    gl_REPLACE_FCLOSE
+  fi
 ])
 
 AC_DEFUN([gl_REPLACE_FCLOSE],