To: vim_dev@googlegroups.com
Subject: Patch 7.4b.016
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4b.016
Problem:    Ruby detection fails on Fedora 19.
Solution:   Use one way to get the Ruby version. (Michael Henry)
Files:	    src/configure.in, src/auto/configure


*** ../vim-7.4b.015/src/configure.in	2013-07-28 13:13:55.000000000 +0200
--- src/configure.in	2013-08-04 20:00:50.000000000 +0200
***************
*** 1659,1664 ****
--- 1659,1667 ----
            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
*** ../vim-7.4b.015/src/auto/configure	2013-07-28 13:14:08.000000000 +0200
--- src/auto/configure	2013-08-04 20:01:06.000000000 +0200
***************
*** 6741,6746 ****
--- 6741,6749 ----
            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
*** ../vim-7.4b.015/src/version.c	2013-08-05 22:02:16.000000000 +0200
--- src/version.c	2013-08-07 15:21:36.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
  {   /* Add new patch number below this line */
+ /**/
+     16,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
56. You leave the modem speaker on after connecting because you think it
    sounds like the ocean wind...the perfect soundtrack for "surfing the net".

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///