changeset 14447:f103c66ea515 v8.1.0237

patch 8.1.0237: Ruby on Cygwin doesn't always work commit https://github.com/vim/vim/commit/87ea64ca965ca00b3e72776c39355964293f2ace Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 4 15:13:34 2018 +0200 patch 8.1.0237: Ruby on Cygwin doesn't always work Problem: Ruby on Cygwin doesn't always work. Solution: Use LIBRUBY_SO if LIBRUBY_ALIASES isn't set. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sat, 04 Aug 2018 15:15:05 +0200
parents b8a832fd1f8b
children fe6e859a75ad
files src/auto/configure src/configure.ac src/version.c
diffstat 3 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7606,6 +7606,9 @@ fi
 
 	if test "$enable_rubyinterp" = "dynamic"; then
 	  libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_ALIASES'].split[0]"`
+	  if test -z "$libruby_soname"; then
+	    libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_SO']"`
+	  fi
 	  $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
 
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1956,6 +1956,9 @@ if test "$enable_rubyinterp" = "yes" -o 
 	AC_DEFINE(FEAT_RUBY)
 	if test "$enable_rubyinterp" = "dynamic"; then
 	  libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[['LIBRUBY_ALIASES']].split[[0]]"`
+	  if test -z "$libruby_soname"; then
+	    libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[['LIBRUBY_SO']]"`
+	  fi
 	  AC_DEFINE(DYNAMIC_RUBY)
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
 	  RUBY_LIBS=
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    237,
+/**/
     236,
 /**/
     235,