nobu	2015-06-18 23:25:54 +0900 (Thu, 18 Jun 2015)

  New Revision: 50959

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50959

  Log:
    extmk.rb: fix with-ext condition
    
    * ext/extmk.rb: configure intersection of with-ext and not
      without-ext, as withouts is no longer true by default if
      with-ext option is given.  [ruby-dev:49108] [Bug #11280]

  Modified files:
    trunk/ChangeLog
    trunk/ext/extmk.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50958)
+++ ChangeLog	(revision 50959)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jun 18 23:25:51 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb: configure intersection of with-ext and not
+	  without-ext, as withouts is no longer true by default if
+	  with-ext option is given.  [ruby-dev:49108] [Bug #11280]
+
 Thu Jun 18 23:20:46 2015  SHIBATA Hiroshi  <hsbt@r...>
 
 	* include/ruby/ruby.h: $SAFE=2 is now obsolete.
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 50958)
+++ ext/extmk.rb	(revision 50959)
@@ -514,7 +514,7 @@ withes, withouts = [["--with", nil], ["- https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L514
 }
 cond = proc {|ext, *|
   cond1 = proc {|n| File.fnmatch(n, ext)}
-  withes.call(cond1) or !withouts.call(cond1)
+  withes.call(cond1) and !withouts.call(cond1)
 }
 ($extension || %w[*]).each do |e|
   e = e.sub(/\A(?:\.\/)+/, '')

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