From 99f16c180711fce0bab97ab418a9c33f2bfdb593 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 6 May 2011 13:21:22 +0200 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ m4/fflush.m4 | 13 +++---------- modules/fflush | 4 ++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff042a31fe..4a50443496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-06 Bruno Haible + + 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 fdopendir: Move AC_LIBOBJ invocations to module description. diff --git a/m4/fflush.m4 b/m4/fflush.m4 index 69eb86efe1..a91ee0beab 100644 --- 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 @@ dnl unread input on seekable streams, rather than C99 undefined semantics. 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_FUNC_FFLUSH_STDIN], ]) ]) -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], [ diff --git a/modules/fflush b/modules/fflush index 1d26b611b7..16bdbb5272 100644 --- a/modules/fflush +++ b/modules/fflush @@ -20,6 +20,10 @@ AC_REQUIRE([AC_FUNC_FSEEKO]) 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]) -- 2.30.2