summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-10 09:12:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-10 09:12:19 +0000
commit12c0aeadd08b7612527e9b7b7fc79d01eafcc25c (patch)
tree931cc4252eb772a2337b5d1b6626644c2b0b9833 /ext
parent1d062259052b4e4589afbd4ddfa5d33135b7f102 (diff)
downloadruby-12c0aeadd08b7612527e9b7b7fc79d01eafcc25c.tar.gz
ruby-12c0aeadd08b7612527e9b7b7fc79d01eafcc25c.tar.xz
ruby-12c0aeadd08b7612527e9b7b7fc79d01eafcc25c.zip
* ext/extmk.rb: negate default of --without-ext.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/extmk.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 309baa9b3..8734eae00 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)