gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / fclose.m4

diff --git a/m4/fclose.m4 b/m4/fclose.m4
index 17acf15..b306b6d 100644 (file)
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -1,22 +1,20 @@
-# fclose.m4 serial 3
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# fclose.m4 serial 6
+dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 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],
-[
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  REPLACE_FCLOSE=1
-  AC_LIBOBJ([fclose])
+
+  gl_FUNC_FFLUSH_STDIN
+  if test $gl_cv_func_fflush_stdin != yes; then
+    REPLACE_FCLOSE=1
+  fi
+
+  AC_REQUIRE([gl_FUNC_CLOSE])
+  if test $REPLACE_CLOSE = 1; then
+    REPLACE_FCLOSE=1
+  fi
 ])