From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 25 Jul 2011 14:38:52 +0000 (-0700)
Subject: close: use gl_REPLACE_FCLOSE only if defined
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b94f2b3ac7049ef66bded4596431c453e3710209;p=pspp

close: use gl_REPLACE_FCLOSE only if defined

* m4/close.m4 (gl_REPLACE_CLOSE): Use gl_REPLACE_FCLOSE only if it
is defined.  The close module doesn't depend on the fclose module
any more, so gl_REPLACE_CLOSE's existence cannot be assumed.  See
<http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00392.html>.
I reproduced the problem with "./gnulib-tool --test close sys_socket".
---

diff --git a/ChangeLog b/ChangeLog
index e7ca0e6f1b..b8da59a433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	close: use gl_REPLACE_FCLOSE only if defined
+	* m4/close.m4 (gl_REPLACE_CLOSE): Use gl_REPLACE_FCLOSE only if it
+	is defined.  The close module doesn't depend on the fclose module
+	any more, so gl_REPLACE_CLOSE's existence cannot be assumed.  See
+	<http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00392.html>.
+	I reproduced the problem with "./gnulib-tool --test close sys_socket".
+
 2011-07-24  Jim Meyering  <meyering@redhat.com>
 
 	test-select.h: avoid warning when using gcc's -Wmissing-declarations
diff --git a/m4/close.m4 b/m4/close.m4
index fc131381af..0d8f67a48d 100644
--- a/m4/close.m4
+++ b/m4/close.m4
@@ -1,4 +1,4 @@
-# close.m4 serial 5
+# close.m4 serial 6
 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,
@@ -22,5 +22,5 @@ AC_DEFUN([gl_REPLACE_CLOSE],
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   REPLACE_CLOSE=1
   AC_LIBOBJ([close])
-  gl_REPLACE_FCLOSE
+  m4_ifdef([gl_REPLACE_FCLOSE], [gl_REPLACE_FCLOSE])
 ])