Mercurial > hg > octave-nkf > gnulib-hg
changeset 14697:ae72d1a5b3d6
fclose, fflush: Respect rules for use of AC_LIBOBJ.
* m4/fflush.m4 (gl_FUNC_FFLUSH): Don't invoke gl_REPLACE_FCLOSE.
* m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_FFLUSH_STDIN and
gl_REPLACE_FCLOSE here.
* modules/fflush (Depends-on): Remove fclose.
* doc/posix-functions/fclose.texi: Mention module 'fflush' only in
combination with module 'fclose'.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 06 May 2011 00:34:34 +0200 |
| parents | 0fa7da6f7a52 |
| children | cb78c05783f7 |
| files | ChangeLog doc/posix-functions/fclose.texi m4/fclose.m4 m4/fflush.m4 modules/fflush |
| diffstat | 5 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-05-05 Bruno Haible <bruno@clisp.org> + + fclose, fflush: Respect rules for use of AC_LIBOBJ. + * m4/fflush.m4 (gl_FUNC_FFLUSH): Don't invoke gl_REPLACE_FCLOSE. + * m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_FFLUSH_STDIN and + gl_REPLACE_FCLOSE here. + * modules/fflush (Depends-on): Remove fclose. + * doc/posix-functions/fclose.texi: Mention module 'fflush' only in + combination with module 'fclose'. + 2011-05-05 Bruno Haible <bruno@clisp.org> fflush, fseeko: Respect rules for use of AC_LIBOBJ.
--- a/doc/posix-functions/fclose.texi +++ b/doc/posix-functions/fclose.texi @@ -6,7 +6,7 @@ Gnulib module: fclose, fflush -Portability problems fixed by Gnulib module @code{fflush}: +Portability problems fixed by Gnulib module @code{fclose} together with module @code{fflush}: @itemize @item On some platforms, this function fails to set the file position of a
--- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -1,4 +1,4 @@ -# fclose.m4 serial 2 +# fclose.m4 serial 3 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, @@ -6,6 +6,12 @@ AC_DEFUN([gl_FUNC_FCLOSE], [ + m4_ifdef([gl_FUNC_FFLUSH_STDIN], [ + gl_FUNC_FFLUSH_STDIN + if test $gl_cv_func_fflush_stdin = no; then + gl_REPLACE_FCLOSE + fi + ]) ]) AC_DEFUN([gl_REPLACE_FCLOSE],
--- a/m4/fflush.m4 +++ b/m4/fflush.m4 @@ -1,4 +1,4 @@ -# fflush.m4 serial 10 +# fflush.m4 serial 11 # Copyright (C) 2007-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -15,7 +15,6 @@ gl_FUNC_FFLUSH_STDIN if test $gl_cv_func_fflush_stdin = no; then gl_REPLACE_FFLUSH - gl_REPLACE_FCLOSE fi ])