From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 13 Jan 2011 19:23:36 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b068a03c2cba48e93c50376d02cf6cfb6a70e72e;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

b068a03c2cba48e93c50376d02cf6cfb6a70e72e
diff --cc tests/compile_f_c_cxx.test
index ef0692dc8,d1836fb9f..e3b51a421
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@@ -31,8 -33,15 +31,11 @@@ EN
  cat > Makefile.am << 'END'
  bin_PROGRAMS = foo
  foo_SOURCES  = foo.f bar.c baz.cc
 -foo_LDADD    = @FLIBS@
  END
  
 -: > foo.f
 -: > bar.c
 -: > baz.cc
+ : > config.guess
+ : > config.sub
+ 
  $ACLOCAL
  $AUTOMAKE