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 e7ca0e6f1b827dab30b05c9e641829330e05295f..b8da59a43379dbd6f6d8ff583dbcb523c5563722 100644 (file)
--- 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 fc131381af97fd7e3f3953eb79432769983b2265..0d8f67a48dc673f8fe9b43b2cbafb4cb8f9d4033 100644 (file)
--- 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])
 ])