1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/psych/extconf.rb: Making library detection more agnostic.

Browse Source 
[ruby-core:29118]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2010-03-29 23:57:43 +00:00
parent 797f482fe8
commit 9dd3af9ae7
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Mar 30 08:55:50 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/extconf.rb: Making library detection more agnostic.
Tue Mar 30 08:10:59 2010 Aaron Patterson <aaron@tenderlovemaking.com> Tue Mar 30 08:10:59 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* lib/psych.rb: Fix problem with empty and white-space only strings. * lib/psych.rb: Fix problem with empty and white-space only strings.

10
ext/psych/extconf.rb
View File

@ -2,16 +2,10 @@ require 'mkmf'
# :stopdoc: # :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 def asplode missing
abort "#{missing} is missing. Try 'port install libyaml +universal' " + abort "#{missing} is missing. Please install libyaml."
"or 'yum install libyaml-devel'"
end end
asplode('yaml.h') unless find_header 'yaml.h' asplode('yaml.h') unless find_header 'yaml.h'