# HG changeset patch # User Bruno Haible # Date 1322437381 -3600 # Node ID df1c78661f1f74fd698a4674f18a4dd90bc35ed3 # Parent c56792ef17f5685f57b480ac90be6b54589a7221 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. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-11-27 Bruno Haible + + 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 getcwd: Fix bug from 2011-08-17. diff --git a/m4/closedir.m4 b/m4/closedir.m4 --- 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 @@ 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 --- 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 @@ 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 --- 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 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 --- 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 @@ 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 ]) ])