fcntl: Remove call-in from fchdir.m4.

* m4/fcntl.m4 (gl_FUNC_FCNTL): Conditionally invoke gl_TEST_FCHDIR.
* m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke gl_REPLACE_FCNTL.

diff --git a/ChangeLog b/ChangeLog
index ed1c1f713b0ca8e249d5c22eb89acdd64080e8b6..f7769291661922c2edde02398221a5bb015687f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-25  Bruno Haible  <bruno@clisp.org>
 
+       fcntl: Remove call-in from fchdir.m4.
+       * m4/fcntl.m4 (gl_FUNC_FCNTL): Conditionally invoke gl_TEST_FCHDIR.
+       * m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke gl_REPLACE_FCNTL.
+
        dup3: Remove potential call-in from fchdir.m4.
        * m4/dup3.m4 (gl_FUNC_DUP3): Add comment about fchdir.
        * m4/fchdir.m4 (gl_FUNC_FCHDIR): Remove comment about dup3.

diff --git a/m4/fchdir.m4 b/m4/fchdir.m4
index 502f62e9e4730308fb3797bb9e53a69b3d4c8c93..a387dbb4f9fa80860cd3221c8128ad130436667b 100644 (file)
--- a/m4/fchdir.m4
+++ b/m4/fchdir.m4
@@ -27,7 +27,6 @@ AC_DEFUN([gl_FUNC_FCHDIR],
     REPLACE_OPENDIR=1
     REPLACE_CLOSEDIR=1
     REPLACE_DUP=1
-    gl_REPLACE_FCNTL
     AC_CACHE_CHECK([whether open can visit directories],
       [gl_cv_func_open_directory_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>

diff --git a/m4/fcntl.m4 b/m4/fcntl.m4
index a93ed85a368839978f33bc67f7fad66eb1418e03..19704465c13eb1820f199a745943f4adf67ac4ea 100644 (file)
--- a/m4/fcntl.m4
+++ b/m4/fcntl.m4
@@ -1,4 +1,4 @@
-# fcntl.m4 serial 4
+# fcntl.m4 serial 5
 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,
@@ -73,6 +73,14 @@ choke me
       dnl No witness macro needed for this bug.
     fi
   fi
+  dnl Replace fcntl() for supporting the gnulib-defined fchdir() function,
+  dnl to keep fchdir's bookkeeping up-to-date.
+  m4_ifdef([gl_FUNC_FCHDIR], [
+    gl_TEST_FCHDIR
+    if test $HAVE_FCHDIR = 0; then
+      gl_REPLACE_FCNTL
+    fi
+  ])
 ])
 
 AC_DEFUN([gl_REPLACE_FCNTL],