comparison src/auto/configure @ 5280:ba37e955913e v7.4b.016

updated for version 7.4b.016 Problem: Ruby detection fails on Fedora 19. Solution: Use one way to get the Ruby version. (Michael Henry)
author Bram Moolenaar <bram@vim.org>
date Wed, 07 Aug 2013 15:22:23 +0200
parents da95a7f1d5a8
children 31c9acfeda8f
comparison
equal deleted inserted replaced
5279:cf95e401ba4a 5280:ba37e955913e
6739 rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['arch']"` 6739 rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['arch']"`
6740 if test -d "$rubyhdrdir/$rubyarch"; then 6740 if test -d "$rubyhdrdir/$rubyarch"; then
6741 RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" 6741 RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
6742 fi 6742 fi
6743 rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"` 6743 rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"`
6744 if test "X$rubyversion" = "X"; then
6745 rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[0,2]"`
6746 fi
6744 RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" 6747 RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
6745 rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LIBS']"` 6748 rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LIBS']"`
6746 if test "X$rubylibs" != "X"; then 6749 if test "X$rubylibs" != "X"; then
6747 RUBY_LIBS="$rubylibs" 6750 RUBY_LIBS="$rubylibs"
6748 fi 6751 fi