From 9f8ead3f5a65926de526c74e27aa6c599e3b2bc3 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 10 Jun 2008 09:12:19 +0000 Subject: [PATCH] * ext/extmk.rb: negate default of --without-ext. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/extmk.rb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5f57f88490..8af72c40f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jun 10 18:12:17 2008 Nobuyoshi Nakada + + * ext/extmk.rb: negate default of --without-ext. + Tue Jun 10 17:01:58 2008 wanabe * util.c (ruby_strtod): ruby_strtod don't allow a trailing diff --git a/ext/extmk.rb b/ext/extmk.rb index 64746552c1..78707d7e9d 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -408,13 +408,15 @@ if $extension else withes, withouts = %w[--with --without].collect {|w| if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any? - proc {false} + nil elsif (w = w.grep(String)).empty? proc {true} else proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)} end } + withes ||= proc {false} + withouts ||= proc {true} cond = proc {|ext| cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)} withes.call(cond1) or !withouts.call(cond1)