diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 09:12:19 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 09:12:19 +0000 |
commit | 6f8bf830b44c9394a6afed4b02ecd4bc6b960342 (patch) | |
tree | 931cc4252eb772a2337b5d1b6626644c2b0b9833 | |
parent | dd6f7fbaef4be05435870399a44ae98356ea1399 (diff) | |
download | ruby-6f8bf830b44c9394a6afed4b02ecd4bc6b960342.tar.gz |
* ext/extmk.rb: negate default of --without-ext.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/extmk.rb | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Jun 10 18:12:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb: negate default of --without-ext. + Tue Jun 10 17:43:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * array.c (rb_ary_shuffle_bang): update RDoc. [ruby-dev:35034] diff --git a/ext/extmk.rb b/ext/extmk.rb index 309baa9b3f..8734eae00f 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -399,13 +399,15 @@ if $extension else withes, withouts = %w[--with --without].collect {|w| if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any? - proc {false} + nil elsif (w = w.grep(String)).empty? proc {true} else proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)} end } + withes ||= proc {false} + withouts ||= proc {true} cond = proc {|ext, *| cond1 = proc {|n| File.fnmatch(n, ext)} withes.call(cond1) or !withouts.call(cond1) |