diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/psych/extconf.rb | 10 |
2 files changed, 6 insertions, 8 deletions
@@ -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> * lib/psych.rb: Fix problem with empty and white-space only strings. diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb index 673b950a63..d789b35e5c 100644 --- a/ext/psych/extconf.rb +++ b/ext/psych/extconf.rb @@ -2,16 +2,10 @@ require 'mkmf' # :stopdoc: -RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] - -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' +dir_config 'libyaml' 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' |