Mercurial > hg > octave-lojdl > gnulib-hg

changeset 14938:e45dcf244493

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fflush: Move AC_LIBOBJ invocations to module description. * m4/fflush.m4 (gl_REPLACE_FFLUSH): Remove macro. (gl_FUNC_FFLUSH): Inline it here. Move AC_LIBOBJ and gl_PREREQ_FFLUSH invocations from here... * modules/fflush (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Fri, 06 May 2011 13:21:22 +0200
parents a6c05261a4fc
children c400cbc2e1e5
files ChangeLog m4/fflush.m4 modules/fflush
diffstat 3 files changed, 15 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-06  Bruno Haible  <bruno@clisp.org>
+
+	fflush: Move AC_LIBOBJ invocations to module description.
+	* m4/fflush.m4 (gl_REPLACE_FFLUSH): Remove macro.
+	(gl_FUNC_FFLUSH): Inline it here. Move AC_LIBOBJ and gl_PREREQ_FFLUSH
+	invocations from here...
+	* modules/fflush (configure.ac): ... to here.
+
 2011-05-06  Bruno Haible  <bruno@clisp.org>
 
 	fdopendir: Move AC_LIBOBJ invocations to module description.
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,4 +1,4 @@
-# fflush.m4 serial 11
+# fflush.m4 serial 12
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -12,9 +12,10 @@
 
 AC_DEFUN([gl_FUNC_FFLUSH],
 [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   gl_FUNC_FFLUSH_STDIN
   if test $gl_cv_func_fflush_stdin = no; then
-    gl_REPLACE_FFLUSH
+    REPLACE_FFLUSH=1
   fi
 ])
 
@@ -72,14 +73,6 @@
     ])
 ])
 
-AC_DEFUN([gl_REPLACE_FFLUSH],
-[
-  AC_LIBOBJ([fflush])
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  REPLACE_FFLUSH=1
-  gl_PREREQ_FFLUSH
-])
-
 # Prerequisites of lib/fflush.c.
 AC_DEFUN([gl_PREREQ_FFLUSH],
 [
--- a/modules/fflush
+++ b/modules/fflush
@@ -20,6 +20,10 @@
 
 configure.ac:
 gl_FUNC_FFLUSH
+if test $REPLACE_FFLUSH = 1; then
+  AC_LIBOBJ([fflush])
+  gl_PREREQ_FFLUSH
+fi
 gl_MODULE_INDICATOR([fflush])
 gl_STDIO_MODULE_INDICATOR([fflush])