Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixes for Ruby 1.9.

  • Loading branch information...
commit 07d423d9fa15ef46fd210fde878c96db9f024a95 1 parent c8d83e2
shugo authored
Showing with 5 additions and 3 deletions.
  1. +1 −0  Makefile.in
  2. +2 −0  autoconf.rb
  3. +2 −0  configure.rb
  4. +0 −3  mod_ruby.c
View
1  Makefile.in
@@ -47,6 +47,7 @@ INSTALL_DLLIB = @INSTALL_DLLIB@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
+ruby_install_name = @ruby_install_name@
RUBY_INSTALL_NAME = @RUBY_INSTALL_NAME@
LIBRUBYARG = @LIBRUBYARG@
LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
View
2  autoconf.rb
@@ -363,6 +363,7 @@ def AC_PROG_INSTALL
$EXEEXT = CONFIG["EXEEXT"]
$DLEXT = CONFIG["DLEXT"]
+$ruby_install_name = CONFIG["ruby_install_name"]
$RUBY_INSTALL_NAME = CONFIG["RUBY_INSTALL_NAME"]
$RUBY_SHARED = (CONFIG["ENABLE_SHARED"] == "yes")
$LIBRUBYARG = CONFIG["LIBRUBYARG"]
@@ -447,6 +448,7 @@ def AC_PROG_INSTALL
AC_SUBST("COMPILE_RULES")
+AC_SUBST("ruby_install_name")
AC_SUBST("RUBY_INSTALL_NAME")
AC_SUBST("LIBRUBYARG")
AC_SUBST("LIBRUBYARG_SHARED")
View
2  configure.rb
@@ -341,6 +341,7 @@ def AC_PROG_INSTALL
$EXEEXT = CONFIG["EXEEXT"]
$DLEXT = CONFIG["DLEXT"]
+$ruby_install_name = CONFIG["ruby_install_name"]
$RUBY_INSTALL_NAME = CONFIG["RUBY_INSTALL_NAME"]
$RUBY_SHARED = (CONFIG["ENABLE_SHARED"] == "yes")
$LIBRUBYARG = CONFIG["LIBRUBYARG"]
@@ -425,6 +426,7 @@ def AC_PROG_INSTALL
AC_SUBST("COMPILE_RULES")
+AC_SUBST("ruby_install_name")
AC_SUBST("RUBY_INSTALL_NAME")
AC_SUBST("LIBRUBYARG")
AC_SUBST("LIBRUBYARG_SHARED")
View
3  mod_ruby.c
@@ -551,8 +551,6 @@ void mod_ruby_setup_loadpath(ruby_server_config *sconf,
char **paths;
VALUE load_path = GET_LOAD_PATH();
-#ifndef RUBY_VM
-/* FIXME: how to set $: on 1.9? */
rb_ary_clear(load_path);
for (i = 0; i < RARRAY_LEN(default_load_path); i++) {
rb_ary_push(load_path, rb_str_dup(RARRAY_PTR(default_load_path)[i]));
@@ -571,7 +569,6 @@ void mod_ruby_setup_loadpath(ruby_server_config *sconf,
rb_ary_push(load_path, rb_str_new2(paths[i]));
}
}
-#endif
}
static int ruby_require_directly(const char *filename,
Please sign in to comment.
Something went wrong with that request. Please try again.