diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-07-25 23:53:06 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-07-26 00:00:23 +0200 |
| commit | ecfb73db2daf5f2d2babeae18785c0e850c8c685 (patch) | |
| tree | fdace3368d0db2c61f29efcccd444e5aa96d6a13 | |
| parent | 1ed055e3d9cc6e80839fa0b56cca2a5b97462524 (diff) | |
| download | gnulib-ecfb73db2daf5f2d2babeae18785c0e850c8c685.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | m4/close.m4 | 3 | ||||
| -rw-r--r-- | m4/fclose.m4 | 7 |
3 files changed, 10 insertions, 4 deletions
@@ -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 diff --git a/m4/close.m4 b/m4/close.m4 index f2e1ac6f8a..cd30d08cf6 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -26,7 +26,4 @@ AC_DEFUN([gl_FUNC_CLOSE], fi fi ]) - if test $REPLACE_CLOSE = 1; then - m4_ifdef([gl_REPLACE_FCLOSE], [gl_REPLACE_FCLOSE], [:]) - fi ]) diff --git a/m4/fclose.m4 b/m4/fclose.m4 index 349b5f14c4..32f2e26b7a 100644 --- 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 @@ AC_DEFUN([gl_FUNC_FCLOSE], 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], |