Mercurial > hg > octave-nkf > gnulib-hg
changeset 11842:f4bcc8a0cd47
fpurge: fix previous commits
* modules/fpurge (Makefile.am): Make replacement conditional,
partially reverting 2007-04-29 change; missed in previous
attempt.
* m4/fpurge.m4 (gl_FUNC_FPURGE): Also compile fpurge.c when fpurge
is missing.
Signed-off-by: Eric Blake <ebb9@byu.net>
author | Eric Blake <ebb9@byu.net> |
---|---|
date | Sun, 16 Aug 2009 08:59:54 -0600 |
parents | de4ad188001d |
children | 34be1ceef3ba |
files | ChangeLog m4/fpurge.m4 modules/fpurge |
diffstat | 3 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-08-16 Eric Blake <ebb9@byu.net> + + fpurge: fix previous commits + * modules/fpurge (Makefile.am): Make replacement conditional, + partially reverting 2007-04-29 change; missed in previous + attempt. + * m4/fpurge.m4 (gl_FUNC_FPURGE): Also compile fpurge.c when fpurge + is missing. + 2009-08-16 Bruno Haible <bruno@clisp.org> Clarify fpurge's effect on the file position. @@ -16,8 +25,8 @@ fpurge: don't wrap working cygwin implementation * lib/fpurge.c (fpurge): Fix comment typo. - * modules/fpurge (Makefile.am): Make replacement conditional, - partially reverting 2007-04-29 change. + * m4/fpurge.m4 (gl_FUNC_FPURGE): Detect BSD bug, allowing cygwin + 1.7 to avoid replacement. * tests/test-fpurge.c (main): Enhance test. 2009-08-15 Eric Blake <ebb9@byu.net>
--- a/m4/fpurge.m4 +++ b/m4/fpurge.m4 @@ -1,4 +1,4 @@ -# fpurge.m4 serial 5 +# fpurge.m4 serial 6 dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,6 +36,8 @@ REPLACE_FPURGE=1 AC_LIBOBJ([fpurge]) fi + else + AC_LIBOBJ([fpurge]) fi if test "x$ac_cv_have_decl_fpurge" = xno; then HAVE_DECL_FPURGE=0