# HG changeset patch # User Bruno Haible # Date 1311631975 -7200 # Node ID 7340707eeaf84e8a7b48cd8bd9abfc4f63736d4d # Parent c9762c11f058cada459b75b96535d6b573af62a1 dup2: Remove call-in from fchdir.m4. * m4/dup2.m4 (gl_FUNC_DUP2): Conditionally invoke gl_TEST_FCHDIR. * m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke gl_REPLACE_DUP2. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-07-25 Bruno Haible + dup2: Remove call-in from fchdir.m4. + * m4/dup2.m4 (gl_FUNC_DUP2): Conditionally invoke gl_TEST_FCHDIR. + * m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke gl_REPLACE_DUP2. + fclose: Move AC_LIBOBJ invocation to module description. * m4/fclose.m4 (gl_REPLACE_FCLOSE): Remove macro. (gl_FUNC_FCLOSE): Instead of gl_REPLACE_FCLOSE, just set REPLACE_FCLOSE diff --git a/m4/dup2.m4 b/m4/dup2.m4 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,4 +1,4 @@ -#serial 13 +#serial 14 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, @@ -63,6 +63,14 @@ gl_REPLACE_DUP2 fi fi + dnl Replace dup2() 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_DUP2 + fi + ]) ]) AC_DEFUN([gl_REPLACE_DUP2], diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -27,7 +27,6 @@ REPLACE_OPENDIR=1 REPLACE_CLOSEDIR=1 REPLACE_DUP=1 - gl_REPLACE_DUP2 dnl dup3 is already unconditionally replaced gl_REPLACE_FCNTL AC_CACHE_CHECK([whether open can visit directories],