diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-06-12 21:22:58 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-06-12 21:22:58 +0200 |
commit | 6febcd41b3dcf99a89aaf21329c00fdadcd68771 (patch) | |
tree | fbd61f18dff484ee018aebdba27ae0d26906faa4 /bin | |
parent | 9892eb7823b3fd0e552ab22b63f58d947e9de584 (diff) | |
parent | ddc755a63c4318f70e6743f9f0debd0614311699 (diff) | |
download | automake-6febcd41b3dcf99a89aaf21329c00fdadcd68771.tar.gz |
Merge branch 'micro' into maint
* micro:
THANKS: update e-mall address for Ralf Corsepius
lang, suffix rules: don't require C stuff needlessly
tests: expose automake bug#14560
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'bin')
-rw-r--r-- | bin/automake.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/automake.in b/bin/automake.in index 40b31814b..283d1bbfe 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -1481,10 +1481,11 @@ sub handle_languages () # If the project is entirely C++ or entirely Fortran 77 (i.e., 1 # suffix rule was learned), don't bother with the C stuff. But if # anything else creeps in, then use it. - $needs_c = 1 - if $need_link || suffix_rules_count > 1; - - if ($needs_c) + my @languages_seen = map { $languages{$extension_map{$_}}->name } + (keys %extension_seen); + @languages_seen = uniq (@languages_seen); + $needs_c = 1 if @languages_seen > 1; + if ($need_link || $needs_c) { define_compiler_variable ($languages{'c'}) unless defined $done{$languages{'c'}}; |