diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-08-07 15:22:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-08-07 15:22:23 +0200 |
| commit | 026a445c4034ce3f489d582c45e2cf49bd77322e (patch) | |
| tree | 98bf5236cbfeac43bb0682c2b4c087f5ccacc584 | |
| parent | 01c458e4383002519b542c95371153eb4b83789e (diff) | |
updated for version 7.4b.016v7.4b.016
Problem: Ruby detection fails on Fedora 19.
Solution: Use one way to get the Ruby version. (Michael Henry)
| -rwxr-xr-x | src/auto/configure | 3 | ||||
| -rw-r--r-- | src/configure.in | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index 62aeab9fd5..a9755a0b6e 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -6741,6 +6741,9 @@ $as_echo "$rubyhdrdir" >&6; } RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" fi rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"` + if test "X$rubyversion" = "X"; then + rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[0,2]"` + fi RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LIBS']"` if test "X$rubylibs" != "X"; then diff --git a/src/configure.in b/src/configure.in index c20b198da8..ed30bedf86 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1659,6 +1659,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" fi rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"` + if test "X$rubyversion" = "X"; then + rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[[0,2]]"` + fi RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LIBS']]"` if test "X$rubylibs" != "X"; then diff --git a/src/version.c b/src/version.c index 607ba9aae9..c856835e70 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 16, +/**/ 15, /**/ 14, |