usa	2012-11-29 15:54:53 +0900 (Thu, 29 Nov 2012)

  New Revision: 37977

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

  Log:
    * ext/psych/extconf.rb: added --enable-bundled-libyaml option.  this
      enforces using bundled libyaml.

  Modified files:
    trunk/ChangeLog
    trunk/ext/psych/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37976)
+++ ChangeLog	(revision 37977)
@@ -1,3 +1,8 @@
+Thu Nov 29 15:53:38 2012  NAKAMURA Usaku  <usa@r...>
+
+	* ext/psych/extconf.rb: added --enable-bundled-libyaml option.  this
+	  enforces using bundled libyaml.
+
 Thu Nov 29 15:51:54 2012  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems*:  Updated to RubyGems 2.0
Index: ext/psych/extconf.rb
===================================================================
--- ext/psych/extconf.rb	(revision 37976)
+++ ext/psych/extconf.rb	(revision 37977)
@@ -6,7 +6,7 @@
 
 dir_config 'libyaml'
 
-unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
+if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_library('yaml', 'yaml_get_version'))
   # Embed libyaml since we could not find it.
 
   $VPATH << "$(srcdir)/yaml"

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