Fixed C-API include dir in ext_helper (thanks jfire).

txus · Dec 5, 2011 · 6559ccb · 6559ccb
1 parent a4b7984
commit 6559ccb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Rakefile b/Rakefile
@@ -33,7 +33,7 @@ end
 require config_rb
 BUILD_CONFIG = Rubinius::BUILD_CONFIG
 
-unless BUILD_CONFIG[:config_version] == 147
+unless BUILD_CONFIG[:config_version] == 148
   STDERR.puts "Your configuration is outdated, please run ./configure first"
   exit 1
 end

diff --git a/configure b/configure
@@ -114,7 +114,7 @@ class Configure
     @libversion = "2.0"
     @version = "#{@libversion}.0dev"
     @release_date = "yyyy-mm-dd"
-    @config_version = 147
+    @config_version = 148
 
     # TODO: add conditionals for platforms
     if RbConfig::CONFIG["build_os"] =~ /darwin/

diff --git a/rakelib/ext_helper.rb b/rakelib/ext_helper.rb
@@ -140,8 +140,12 @@ def add_rbx_capi
     add_cflag "-O2"
     add_cxxflag "-O2"
   end
-  add_include_dir include18_dir
-  add_include_dir include19_dir
+
+  if RUBY_VERSION =~ /^1\.8/
+    add_include_dir include18_dir
+  else
+    add_include_dir include19_dir
+  end
 end
 
 # Setup some initial computed values