1--- src/extconf.rb.orig	2011-04-06 19:35:39 UTC
2+++ src/extconf.rb
3@@ -36,16 +36,16 @@ if unknown = enable_config("unknown")
4
5 if unknown = enable_config("unknown")
6    libs = if CONFIG.key?("LIBRUBYARG_STATIC")
7-	     Config::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
8+	     RbConfig::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
9 	  else
10-	     Config::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
11+	     RbConfig::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
12 	  end
13    unknown = find_library(libs, "ruby_init",
14-			  Config::expand(CONFIG["archdir"].dup))
15+			  RbConfig::expand(CONFIG["archdir"].dup))
16 end
17
18 inc_dir, lib_dir = dir_config("db", "/usr/include", "/usr/lib")
19-case Config::CONFIG["arch"]
20+case RbConfig::CONFIG["arch"]
21 when /solaris2/
22    $DLDFLAGS ||= ""
23    $DLDFLAGS += " -R#{lib_dir}"
24@@ -53,6 +53,7 @@ $CFLAGS += " -DBDB_NO_THREAD_COMPILE" if enable_config
25 $bdb_libdir = lib_dir
26
27 $CFLAGS += " -DBDB_NO_THREAD_COMPILE" if enable_config("thread") == false
28+$CFLAGS += " -Wno-int-conversion"
29
30 unique = with_config("db-uniquename") || ''
31
32@@ -63,10 +64,12 @@ if csv = with_config('db-version')
33 if csv = with_config('db-version')
34    version = csv.split(',', -1)
35    version << '' if version.empty?
36-elsif m = lib_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))(?:$|/)}) ||
37-          inc_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))(?:$|/)})
38+elsif m = lib_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))|([1-9][0-9]+)(?:$|/)}) ||
39+          inc_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))(|([1-9][0-9]+)?:$|/)})
40    if m[1]
41       version = [m[1], '']
42+   elsif m[6]
43+      version = [m[6], '']
44    else
45       if m[2]
46          major, minor = m[2], m[3]
47@@ -94,7 +97,7 @@ catch(:done) do
48          end
49          next if with_ver.empty?
50          if !unique.is_a?(String) || unique.empty?
51-            m = with_ver.match(/^[^0-9]*([2-9])\.?([0-9]{0,3})/)
52+            m = with_ver.match(/^[^0-9]*([1-9][0-9]*)\.?([0-9]{0,3})/)
53             major = m[1].to_i
54             minor = m[2].to_i
55             db_version = "db_version_" + (1000 * major + minor).to_s
56