From f8d9634f9cf2e26fcada6a663e28bfb1bc7d531c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 26 Jul 2011 00:01:49 +0200 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ m4/fclose.m4 | 13 ++++--------- modules/fclose | 3 +++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca420ae81..4eff46f3b 100644 --- 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 index 32f2e26b7..92fa07213 100644 --- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -6,20 +6,15 @@ dnl with or without modifications, as long as this notice is preserved. 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 index e6493c908..85f63fe44 100644 --- a/modules/fclose +++ b/modules/fclose @@ -14,6 +14,9 @@ lseek [test $REPLACE_FCLOSE = 1] configure.ac: gl_FUNC_FCLOSE +if test $REPLACE_FCLOSE = 1; then + AC_LIBOBJ([fclose]) +fi gl_STDIO_MODULE_INDICATOR([fclose]) Makefile.am: -- 2.11.0