From 73653014707ab292212a703edab2c82fadf7c2b3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 12 Jul 2008 13:30:46 +0000
Subject: * include/ruby/intern.h (HAVE_RUBY_RUBY_H): defines macros so that  
 extconf.rb do not need to check if headers exist under separated   directory.
  [ruby-dev:35437]

* include/{ruby,rubyio,rubysig}.h, include/ruby/intern.h: use
  "ruby/..." instead of <ruby/...>.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog             |  9 +++++++++
 include/ruby.h        | 22 ++++++++++++++++++++--
 include/ruby/intern.h |  2 +-
 include/rubyio.h      |  2 +-
 include/rubysig.h     |  2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 221a28828e..84cd2a45fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jul 12 22:30:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (HAVE_RUBY_RUBY_H): defines macros so that
+	  extconf.rb do not need to check if headers exist under separated
+	  directory.  [ruby-dev:35437]
+
+	* include/{ruby,rubyio,rubysig}.h, include/ruby/intern.h: use
+	  "ruby/..." instead of <ruby/...>.
+
 Sat Jul 12 22:17:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (sizeof ptrdiff_t): check for size of ptrdiff_t.
diff --git a/include/ruby.h b/include/ruby.h
index cbe5aaa3bf..2cb3fbf9f7 100644
--- a/include/ruby.h
+++ b/include/ruby.h
@@ -12,9 +12,27 @@
 #ifndef RUBY_H
 #define RUBY_H 1
 
-#include <ruby/ruby.h>
+#define HAVE_RUBY_DEFINES_H     1
+#define HAVE_RUBY_ENCODING_H    1
+#define HAVE_RUBY_INTERN_H      1
+#define HAVE_RUBY_IO_H          1
+#define HAVE_RUBY_MISSING_H     1
+#define HAVE_RUBY_MVM_H         1
+#define HAVE_RUBY_NODE_H        1
+#define HAVE_RUBY_ONIGURUMA_H   1
+#define HAVE_RUBY_RE_H          1
+#define HAVE_RUBY_REGEX_H       1
+#define HAVE_RUBY_RUBY_H        1
+#define HAVE_RUBY_SIGNAL_H      1
+#define HAVE_RUBY_ST_H          1
+#define HAVE_RUBY_UTIL_H        1
+#ifdef _WIN32
+#define HAVE_RUBY_WIN32_H       1
+#endif
+
+#include "ruby/ruby.h"
 #if RUBY_VM
-#include <ruby/mvm.h>
+#include "ruby/mvm.h"
 #endif
 
 extern void ruby_set_debug_option(const char *);
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 405d473e39..b009384d9f 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -26,7 +26,7 @@ extern "C" {
 #else
 # include <varargs.h>
 #endif
-#include <ruby/st.h>
+#include "ruby/st.h"
 
 /* 
  * Functions and variables that are used by more than one source file of
diff --git a/include/rubyio.h b/include/rubyio.h
index f385058c44..59ecedca96 100644
--- a/include/rubyio.h
+++ b/include/rubyio.h
@@ -1 +1 @@
-#include <ruby/io.h>
+#include "ruby/io.h"
diff --git a/include/rubysig.h b/include/rubysig.h
index cc8cdb2f6d..9546127938 100644
--- a/include/rubysig.h
+++ b/include/rubysig.h
@@ -1 +1 @@
-#include <ruby/signal.h>
+#include "ruby/signal.h"
-- 
cgit v1.2.3