From 6559ccb5b15e0e2fc573fec35ea4101740356eec Mon Sep 17 00:00:00 2001
From: Brian Ford <brixen@gmail.com>
Date: Mon, 5 Dec 2011 14:00:26 -0800
Subject: [PATCH] Fixed C-API include dir in ext_helper (thanks jfire).

---
 Rakefile              | 2 +-
 configure             | 2 +-
 rakelib/ext_helper.rb | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 8f2c293d95..c17c477053 100644
--- 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
index 5de461f104..8ea58d90bf 100755
--- 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
index 8a973a86f8..e577546e6c 100644
--- 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