* configure.in (RUBY_LIB_VERSION): added for library version, to

  split from core version.  [ruby-dev:37748]

* configure.in (RUBY_LIB_PATH, etc): moved actual version
  dependent stuff to version.c.

* ruby.c (ruby_init_loadpath_safe): ditto.

* version.c (ruby_initial_load_paths): moved initial load path
  version depending on version from ruby.c.

* version.h (RUBY_VERSION_{MAJOR,MINOR,TEENY}): now mean library
  and API version, and reverted to 1.9.1.  [ruby-dev:37889]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 31 insertions, 0 deletions

diff --git a/version.c b/version.c
index 53edf02574..ba2020d9b6 100644
--- a/version.c
+++ b/version.c
@@ -16,6 +16,13 @@
 #define PRINT(type) puts(ruby_##type)
 #define MKSTR(type) rb_obj_freeze(rb_usascii_str_new(ruby_##type, sizeof(ruby_##type)-1))
 
+#ifndef RUBY_ARCH
+#define RUBY_ARCH RUBY_PLATFORM
+#endif
+#ifndef RUBY_SITEARCH
+#define RUBY_SITEARCH RUBY_ARCH
+#endif
+
 const char ruby_version[] = RUBY_VERSION;
 const char ruby_release_date[] = RUBY_RELEASE_DATE;
 const char ruby_platform[] = RUBY_PLATFORM;
@@ -24,6 +31,30 @@ const char ruby_description[] = RUBY_DESCRIPTION;
 const char ruby_copyright[] = RUBY_COPYRIGHT;
 const char ruby_engine[] = "ruby";
 
+const char ruby_initial_load_paths[] =
+#ifdef RUBY_SEARCH_PATH
+    RUBY_SEARCH_PATH "\0"
+#endif
+    RUBY_SITE_LIB2 "\0"
+#ifdef RUBY_SITE_THIN_ARCHLIB
+    RUBY_SITE_THIN_ARCHLIB "\0"
+#endif
+    RUBY_SITE_ARCHLIB "\0"
+    RUBY_SITE_LIB "\0"
+
+    RUBY_VENDOR_LIB2 "\0"
+#ifdef RUBY_VENDOR_THIN_ARCHLIB
+    RUBY_VENDOR_THIN_ARCHLIB "\0"
+#endif
+    RUBY_VENDOR_ARCHLIB "\0"
+    RUBY_VENDOR_LIB "\0"
+
+    RUBY_LIB "\0"
+#ifdef RUBY_THIN_ARCHLIB
+    RUBY_THIN_ARCHLIB "\0"
+#endif
+    RUBY_ARCHLIB "\0";
+
 void
 Init_version(void)
 {