aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/extmk.rb8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0865018727..76f1211c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Tue Jun 10 18:12:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 10 20:13:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: negate default of --without-ext if --with-ext is
+ given.
* ext/extmk.rb: negate default of --without-ext.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 8734eae00f..ab2ae4f3ee 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -406,8 +406,12 @@ else
proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)}
end
}
- withes ||= proc {false}
- withouts ||= proc {true}
+ if withes
+ withouts ||= proc {true}
+ else
+ withes = proc {false}
+ withouts ||= withes
+ end
cond = proc {|ext, *|
cond1 = proc {|n| File.fnmatch(n, ext)}
withes.call(cond1) or !withouts.call(cond1)