# HG changeset patch # User Bruno Haible # Date 1304680882 -7200 # Node ID e45dcf2444932a3de9c8f52a729760fa90c718fb # Parent a6c05261a4fca2f223a01971ce7f143fb789f4ef 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. diff --git a/ChangeLog b/ChangeLog --- 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 --- 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], [ diff --git a/modules/fflush b/modules/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])