Re: fpurge now available in cygwin

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 8/16/2009 8:32 AM:
> But it looks like your patch didn't quite fix things either - by moving
> the lone call to AC_LIBOBJ([fpurge]) inside the ac_cv_func_fpurge = yes
> block, you are failing to compile fpurge.c when __fpurge exists but not
> fpurge.

And that would be because I didn't fix things right.  My ChangeLog entry
said that I changed modules/fpurge, but I forgot to check that in.  It
also failed to mention my change to m4/fpurge.m4.  So I'm committing this:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqIIX0ACgkQ84KuGfSFAYBOZwCfeLJ8V9ZgvRxHVb0FkZa//7PI
tCgAn1T3lFTR6XSlQv3NG71Z7/01xJNj
=y/ML
-----END PGP SIGNATURE-----

From c3f50f5713bf49cfca0893ce6c6e0c24035b8171 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sun, 16 Aug 2009 08:59:54 -0600
Subject: [PATCH] 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 <address@hidden>
---
 ChangeLog      |   13 +++++++++++--
 m4/fpurge.m4   |    4 +++-
 modules/fpurge |    1 -
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4257394..109d72c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-16  Eric Blake  <address@hidden>
+
+       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  <address@hidden>

        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  <address@hidden>
diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
index 8c4ddb6..4dba2ec 100644
--- 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 @@ AC_DEFUN([gl_FUNC_FPURGE],
       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
diff --git a/modules/fpurge b/modules/fpurge
index 1caa67d..ec11062 100644
--- a/modules/fpurge
+++ b/modules/fpurge
@@ -14,7 +14,6 @@ gl_FUNC_FPURGE
 gl_STDIO_MODULE_INDICATOR([fpurge])

 Makefile.am:
-lib_SOURCES += fpurge.c

 Include:
 <stdio.h>
-- 
1.6.3.3.334.g916e1