From 8024f40d013227c01fdbc9726f1e6aaae17b1de4 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 28 Nov 2011 00:43:01 +0100
Subject: [PATCH] Don't set REPLACE_FOO to 1 if HAVE_FOO is 0.

* m4/opendir.m4 (gl_FUNC_OPENDIR): Don't set REPLACE_OPENDIR to 1 if
HAVE_OPENDIR is 0.
* m4/closedir.m4 (gl_FUNC_CLOSEDIR): Don't set REPLACE_CLOSEDIR to 1 if
HAVE_CLOSEDIR is 0.
* m4/dup2.m4 (gl_FUNC_DUP2): Don't set REPLACE_DUP2 to 1 if HAVE_DUP2
is 0.
* m4/dup3.m4 (gl_FUNC_DUP3): Update comments.
---
 ChangeLog      | 11 +++++++++++
 m4/closedir.m4 |  6 ++++--
 m4/dup2.m4     |  6 ++++--
 m4/dup3.m4     |  6 ++++--
 m4/opendir.m4  |  6 ++++--
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d0efb2ef0..0ef0571e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-11-27  Bruno Haible  <bruno@clisp.org>
 
+	Don't set REPLACE_FOO to 1 if HAVE_FOO is 0.
+	* m4/opendir.m4 (gl_FUNC_OPENDIR): Don't set REPLACE_OPENDIR to 1 if
+	HAVE_OPENDIR is 0.
+	* m4/closedir.m4 (gl_FUNC_CLOSEDIR): Don't set REPLACE_CLOSEDIR to 1 if
+	HAVE_CLOSEDIR is 0.
+	* m4/dup2.m4 (gl_FUNC_DUP2): Don't set REPLACE_DUP2 to 1 if HAVE_DUP2
+	is 0.
+	* m4/dup3.m4 (gl_FUNC_DUP3): Update comments.
+
+2011-11-27  Bruno Haible  <bruno@clisp.org>
+
 	getcwd: Fix bug from 2011-08-17.
 	* m4/getcwd.m4 (gl_FUNC_GETCWD): Set REPLACE_GETCWD to 1 only on
 	platforms that need it.
diff --git a/m4/closedir.m4 b/m4/closedir.m4
index 1b7912a30..a57cd5407 100644
--- a/m4/closedir.m4
+++ b/m4/closedir.m4
@@ -1,4 +1,4 @@
-# closedir.m4 serial 1
+# closedir.m4 serial 2
 dnl Copyright (C) 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,
@@ -17,7 +17,9 @@ AC_DEFUN([gl_FUNC_CLOSEDIR],
   m4_ifdef([gl_FUNC_FCHDIR], [
     gl_TEST_FCHDIR
     if test $HAVE_FCHDIR = 0; then
-      REPLACE_CLOSEDIR=1
+      if test $HAVE_CLOSEDIR = 1; then
+        REPLACE_CLOSEDIR=1
+      fi
     fi
   ])
 ])
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index cd9d254b4..15432828f 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,4 +1,4 @@
-#serial 16
+#serial 17
 dnl Copyright (C) 2002, 2005, 2007, 2009-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,
@@ -67,7 +67,9 @@ AC_DEFUN([gl_FUNC_DUP2],
   m4_ifdef([gl_FUNC_FCHDIR], [
     gl_TEST_FCHDIR
     if test $HAVE_FCHDIR = 0; then
-      REPLACE_DUP2=1
+      if test $HAVE_DUP2 = 1; then
+        REPLACE_DUP2=1
+      fi
     fi
   ])
 ])
diff --git a/m4/dup3.m4 b/m4/dup3.m4
index 29b8dc0a3..6406312f2 100644
--- a/m4/dup3.m4
+++ b/m4/dup3.m4
@@ -1,4 +1,4 @@
-# dup3.m4 serial 3
+# dup3.m4 serial 4
 dnl Copyright (C) 2009-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,7 +22,9 @@ dnl  dnl to keep fchdir's bookkeeping up-to-date.
 dnl  m4_ifdef([gl_FUNC_FCHDIR], [
 dnl    gl_TEST_FCHDIR
 dnl    if test $HAVE_FCHDIR = 0; then
-dnl      REPLACE_DUP3=1
+dnl      if test $HAVE_DUP3 = 1; then
+dnl        REPLACE_DUP3=1
+dnl      fi
 dnl    fi
 dnl  ])
 ])
diff --git a/m4/opendir.m4 b/m4/opendir.m4
index fa315b983..043dee4fb 100644
--- a/m4/opendir.m4
+++ b/m4/opendir.m4
@@ -1,4 +1,4 @@
-# opendir.m4 serial 1
+# opendir.m4 serial 2
 dnl Copyright (C) 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,
@@ -17,7 +17,9 @@ AC_DEFUN([gl_FUNC_OPENDIR],
   m4_ifdef([gl_FUNC_FCHDIR], [
     gl_TEST_FCHDIR
     if test $HAVE_FCHDIR = 0; then
-      REPLACE_OPENDIR=1
+      if test $HAVE_OPENDIR = 1; then
+        REPLACE_OPENDIR=1
+      fi
     fi
   ])
 ])
-- 
2.11.0