Mercurial > hg > octave-lojdl > gnulib-hg
changeset 15467:d93da3ba94f8
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 25 Jul 2011 23:53:06 +0200 |
| parents | 0b88e57dae28 |
| children | c9762c11f058 |
| files | ChangeLog m4/close.m4 m4/fclose.m4 |
| diffstat | 3 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-07-25 Bruno Haible <bruno@clisp.org> + 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. + close: Move AC_LIBOBJ invocation to module description. * m4/close.m4 (gl_REPLACE_CLOSE): Remove macro. (gl_FUNC_CLOSE): Instead of gl_REPLACE_CLOSE, just set REPLACE_CLOSE to
--- a/m4/close.m4 +++ b/m4/close.m4 @@ -26,7 +26,4 @@ fi fi ]) - if test $REPLACE_CLOSE = 1; then - m4_ifdef([gl_REPLACE_FCLOSE], [gl_REPLACE_FCLOSE], [:]) - fi ])
--- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -1,4 +1,4 @@ -# fclose.m4 serial 4 +# fclose.m4 serial 5 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,6 +10,11 @@ if test $gl_cv_func_fflush_stdin = no; then gl_REPLACE_FCLOSE fi + + AC_REQUIRE([gl_FUNC_CLOSE]) + if test $REPLACE_CLOSE = 1; then + gl_REPLACE_FCLOSE + fi ]) AC_DEFUN([gl_REPLACE_FCLOSE],