nobu	2008-06-10 20:13:58 +0900 (Tue, 10 Jun 2008)

  New Revision: 17078

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/extmk.rb
    trunk/ChangeLog
    trunk/ext/extmk.rb

  Log:
    * ext/extmk.rb: negate default of --without-ext if --with-ext is
      given.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/extmk.rb?r1=17078&r2=17077&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17078&r2=17077&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17078&r2=17077&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=17078&r2=17077&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17077)
+++ ChangeLog	(revision 17078)
@@ -1,5 +1,8 @@
-Tue Jun 10 18:12:17 2008  Nobuyoshi Nakada  <nobu@r...>
+Tue Jun 10 20:13:56 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/extmk.rb: negate default of --without-ext if --with-ext is
+	  given.
+
 	* ext/extmk.rb: negate default of --without-ext.
 
 Tue Jun 10 17:43:35 2008  Yukihiro Matsumoto  <matz@r...>
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 17077)
+++ ext/extmk.rb	(revision 17078)
@@ -406,8 +406,12 @@
       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)
Index: ruby_1_8/ext/extmk.rb
===================================================================
--- ruby_1_8/ext/extmk.rb	(revision 17077)
+++ ruby_1_8/ext/extmk.rb	(revision 17078)
@@ -415,8 +415,12 @@
       proc {|c1| w.collect {|opt| opt.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, File::FNM_PATHNAME)}
     withes.call(cond1) or !withouts.call(cond1)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17077)
+++ ruby_1_8/ChangeLog	(revision 17078)
@@ -1,5 +1,8 @@
-Tue Jun 10 18:12:17 2008  Nobuyoshi Nakada  <nobu@r...>
+Tue Jun 10 20:13:56 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/extmk.rb: negate default of --without-ext if --with-ext is
+	  given.
+
 	* ext/extmk.rb: negate default of --without-ext.
 
 Tue Jun 10 17:01:58 2008  wanabe  <s.wanabe@g...>

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/