From: Eric Blake <ebb9@byu.net>
Date: Sun, 16 Aug 2009 14:59:54 +0000 (-0600)
Subject: fpurge: fix previous commits
X-Git-Tag: v0.1~5645
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=c3f50f5713bf49cfca0893ce6c6e0c24035b8171;p=gnulib.git

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>
---

diff --git a/ChangeLog b/ChangeLog
index 4257394fd..109d72ca3 100644
--- 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>
diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
index 8c4ddb6c1..4dba2ec0b 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 1caa67dee..ec1106208 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>