# HG changeset patch # User Bruno Haible # Date 1311631309 -7200 # Node ID c9762c11f058cada459b75b96535d6b573af62a1 # Parent d93da3ba94f85ca2f0be6d623070e0aafefdf3e8 fclose: Move AC_LIBOBJ invocation to module description. * m4/fclose.m4 (gl_REPLACE_FCLOSE): Remove macro. (gl_FUNC_FCLOSE): Instead of gl_REPLACE_FCLOSE, just set REPLACE_FCLOSE to 1. * modules/fclose (configure.ac): Invoke AC_LIBOBJ. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-07-25 Bruno Haible + fclose: Move AC_LIBOBJ invocation to module description. + * m4/fclose.m4 (gl_REPLACE_FCLOSE): Remove macro. + (gl_FUNC_FCLOSE): Instead of gl_REPLACE_FCLOSE, just set REPLACE_FCLOSE + to 1. + * modules/fclose (configure.ac): Invoke AC_LIBOBJ. + fclose: Remove call-in from close.m4. * m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_CLOSE. * m4/close.m4 (gl_FUNC_CLOSE): Don't invoke gl_REPLACE_FCLOSE. diff --git a/m4/fclose.m4 b/m4/fclose.m4 --- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -6,20 +6,15 @@ AC_DEFUN([gl_FUNC_FCLOSE], [ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_FUNC_FFLUSH_STDIN if test $gl_cv_func_fflush_stdin = no; then - gl_REPLACE_FCLOSE + REPLACE_FCLOSE=1 fi AC_REQUIRE([gl_FUNC_CLOSE]) if test $REPLACE_CLOSE = 1; then - gl_REPLACE_FCLOSE + REPLACE_FCLOSE=1 fi ]) - -AC_DEFUN([gl_REPLACE_FCLOSE], -[ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - REPLACE_FCLOSE=1 - AC_LIBOBJ([fclose]) -]) diff --git a/modules/fclose b/modules/fclose --- a/modules/fclose +++ b/modules/fclose @@ -14,6 +14,9 @@ configure.ac: gl_FUNC_FCLOSE +if test $REPLACE_FCLOSE = 1; then + AC_LIBOBJ([fclose]) +fi gl_STDIO_MODULE_INDICATOR([fclose]) Makefile.am: