From d652a1c0a5bf2f973c5328eed983b4df9ccd284f Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 19 Jan 2011 19:46:27 +0100 Subject: [PATCH] Allow _AM_DEPENDENCIES to be used later in configure. * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing conftest.dir before recreating it. Fixes bug#7864. Report by Eric Blake, from report by Scott McCreary against M4. Signed-off-by: Ralf Wildenhues --- ChangeLog | 8 ++++++++ m4/depend.m4 | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d01c3143..c26f1ab8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-01-19 Ralf Wildenhues + + Allow _AM_DEPENDENCIES to be used later in configure. + * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing + conftest.dir before recreating it. + Fixes bug#7864. + Report by Eric Blake, from report by Scott McCreary against M4. + 2011-01-18 Ralf Wildenhues tests: avoid failure on w32 file systems. diff --git a/m4/depend.m4 b/m4/depend.m4 index 830418043..89d37b26d 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -1,12 +1,12 @@ ## -*- Autoconf -*- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010 Free Software Foundation, Inc. +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 11 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -46,6 +46,7 @@ AC_CACHE_CHECK([dependency style of $depcc], # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. -- 2.47.2