updated for version 7.3.678

Problem:    Ruby .so name may not be correct.
Solution:   Use the LIBRUBY_SO entry from the config. (Vit Ondruch)

diff --git a/src/auto/configure b/src/auto/configure
index a5398b101ebd4d1ccc55382cf75ca3daa6c6b1b2..85fe8db2f61bf5de4508d196045726f5b55d1dce 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6376,7 +6376,7 @@ $as_echo "$rubyhdrdir" >&6; }
        $as_echo "#define FEAT_RUBY 1" >>confdefs.h
 
        if test "$enable_rubyinterp" = "dynamic"; then
-         libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG["RUBY_SO_NAME"], Config::CONFIG["DLEXT"]'`
+         libruby=`$vi_cv_path_ruby -r rbconfig -e 'puts Config::CONFIG["LIBRUBY_SO"]'`
          $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
 
          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"

diff --git a/src/configure.in b/src/configure.in
index 4b8c2007982ecfb28441a9d45c73d40c3b155ace..8a7de2c3680eb3df52f16bedeb70ba7dd97f0b67 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1487,7 +1487,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
        RUBY_PRO="if_ruby.pro"
        AC_DEFINE(FEAT_RUBY)
        if test "$enable_rubyinterp" = "dynamic"; then
-         libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG[["RUBY_SO_NAME"]], Config::CONFIG[["DLEXT"]]'`
+         libruby=`$vi_cv_path_ruby -r rbconfig -e 'puts Config::CONFIG[["LIBRUBY_SO"]]'`
          AC_DEFINE(DYNAMIC_RUBY)
          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
          RUBY_LIBS=

diff --git a/src/version.c b/src/version.c
index e0bff5328f35e0411708b389d62bd2d709b877fe..935dfea8786d11d1fdf198816f4917aaa9b872fa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    678,
 /**/
     677,
 /**/