summaryrefslogtreecommitdiff
path: root/m4/depend.m4
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2011-01-19 19:46:27 +0100
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2011-01-19 19:46:27 +0100
commitd652a1c0a5bf2f973c5328eed983b4df9ccd284f (patch)
treee42a77fd66d1c8b1debf4eac9687f6767293849f /m4/depend.m4
parente8e533e2f5039a34c7c13c9cdd88cfbf0ba2f3ec (diff)
downloadautomake-d652a1c0a5bf2f973c5328eed983b4df9ccd284f.tar.gz
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 <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'm4/depend.m4')
-rw-r--r--m4/depend.m45
1 files changed, 3 insertions, 2 deletions
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.