updated for version 7.4b.016

Problem:    Ruby detection fails on Fedora 19.
Solution:   Use one way to get the Ruby version. (Michael Henry)

diff --git a/src/auto/configure b/src/auto/configure
index 62aeab9fd56252e753ff62080adf1a1a4da3254b..a9755a0b6ea16de38eb69b458b160b9913469a01 100755 (executable)
--- 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 c20b198da8631ec0ca62d2e9ff78fa75c4a782e2..ed30bedf86a83a1e0b66ee085b3399a1b8980349 100644 (file)
--- 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 607ba9aae9aef1a1266206d36d6d8c70a28e130b..c856835e70da100a9a674d1688bb18e39abc2750 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    16,
 /**/
     15,
 /**/