ruby-changes:15218
From: tenderlove <ko1@a...>
Date: Tue, 30 Mar 2010 08:58:02 +0900 (JST)
Subject: [ruby-changes:15218] Ruby:r27100 (trunk): * ext/psych/extconf.rb: Making library detection more agnostic.
tenderlove 2010-03-30 08:57:43 +0900 (Tue, 30 Mar 2010) New Revision: 27100 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27100 Log: * ext/psych/extconf.rb: Making library detection more agnostic. [ruby-core:29118] Modified files: trunk/ChangeLog trunk/ext/psych/extconf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 27099) +++ ChangeLog (revision 27100) @@ -1,3 +1,7 @@ +Tue Mar 30 08:55:50 2010 Aaron Patterson <aaron@t...> + + * ext/psych/extconf.rb: Making library detection more agnostic. + Tue Mar 30 08:10:59 2010 Aaron Patterson <aaron@t...> * lib/psych.rb: Fix problem with empty and white-space only strings. Index: ext/psych/extconf.rb =================================================================== --- ext/psych/extconf.rb (revision 27099) +++ ext/psych/extconf.rb (revision 27100) @@ -2,16 +2,10 @@ # :stopdoc: -RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] +dir_config 'libyaml' -INCLUDEDIR = Config::CONFIG['includedir'] -LIBDIR = Config::CONFIG['libdir'] -LIB_DIRS = ['/opt/local/lib', '/usr/local/lib', LIBDIR, '/usr/lib'] -libyaml = dir_config 'libyaml', '/opt/local/include', '/opt/local/lib' - def asplode missing - abort "#{missing} is missing. Try 'port install libyaml +universal' " + - "or 'yum install libyaml-devel'" + abort "#{missing} is missing. Please install libyaml." end asplode('yaml.h') unless find_header 'yaml.h' -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/