nokogiri 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.1
+
+* 1 Bugfix
+
+  * Made sure extconf.rb searched libdir and prefix so that ports libxml/ruby
+    will link properly.  Thanks lucsky!
+
 === 1.0.0 / 2008-07-13
 
 * 1 major enhancement

data/ext/nokogiri/extconf.rb

@@ -3,6 +3,8 @@ ENV["ARCHFLAGS"] = "-arch #{`uname -p` =~ /powerpc/ ? 'ppc' : 'i386'}"
 require 'mkmf'
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+LIBDIR = Config::CONFIG['libdir']
+INCLUDEDIR = Config::CONFIG['includedir']
 
 $CFLAGS << " #{ENV["CFLAGS"]}"
 if Config::CONFIG['target_os'] == 'mingw32'
@@ -19,8 +21,8 @@ if Config::CONFIG['target_os'] == 'mingw32'
   find_library('xslt', 'xsltParseStylesheetDoc',
                File.join(ROOT, 'cross', 'libxslt-1.1.24.win32', 'bin'))
 else
-  find_library('xml2', 'xmlParseDoc')
-  find_library('xslt', 'xsltParseStylesheetDoc')
+  find_library('xml2', 'xmlParseDoc', LIBDIR)
+  find_library('xslt', 'xsltParseStylesheetDoc', LIBDIR)
 end
 
 
@@ -40,10 +42,12 @@ if Config::CONFIG['target_os'] == 'mingw32'
     abort "need iconv"
   end
 else
-  unless find_header('libxml/xmlversion.h', '/usr/include/libxml2')
+  unless find_header('libxml/xmlversion.h',
+                     File.join(INCLUDEDIR, "libxml2"), '/usr/include/libxml2'
+                    )
     abort "need libxml"
   end
-  unless find_header('libxslt/xslt.h', '/usr/include')
+  unless find_header('libxslt/xslt.h', INCLUDEDIR, '/usr/include')
     abort "need libxslt"
   end
 end

data/lib/nokogiri/version.rb

@@ -1,3 +1,3 @@
 module Nokogiri
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-30 00:00:00 -07:00
+date: 2008-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency