From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 4 Aug 2018 13:13:34 +0000 (+0200)
Subject: patch 8.1.0237: Ruby on Cygwin doesn't always work
X-Git-Tag: v8.1.0237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87ea64ca965ca00b3e72776c39355964293f2ace;p=vim

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)
---

diff --git a/src/auto/configure b/src/auto/configure
index de1fd6059..0ab7e2302 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7606,6 +7606,9 @@ $as_echo "$rubyhdrdir" >&6; }
 
 	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"
diff --git a/src/configure.ac b/src/configure.ac
index 0d8ea32d3..8994f3c90 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1956,6 +1956,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
 	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=
diff --git a/src/version.c b/src/version.c
index ec097fd6a..de3a32e5e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    237,
 /**/
     236,
 /**/