diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2011-01-19 19:47:24 +0100 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2011-01-19 19:47:24 +0100 |
| commit | 49d4ef13d8071c9353354fd13df28ebd33db1b11 (patch) | |
| tree | eee4d47e62d6c379b29baf7ac7595d487f224655 /m4 | |
| parent | 8ae4d0aab57e3f646f096b8b3b6297233e91753b (diff) | |
| parent | d652a1c0a5bf2f973c5328eed983b4df9ccd284f (diff) | |
| download | automake-49d4ef13d8071c9353354fd13df28ebd33db1b11.tar.gz | |
Merge branch 'maint' into branch-1.11
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/depend.m4 | 5 |
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. |