Mercurial > vim

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
1657 rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['arch']]"` 1657 rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['arch']]"`
1658 if test -d "$rubyhdrdir/$rubyarch"; then 1658 if test -d "$rubyhdrdir/$rubyarch"; then
1659 RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" 1659 RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
1660 fi 1660 fi
1661 rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"` 1661 rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
1662 if test "X$rubyversion" = "X"; then
1663 rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[[0,2]]"`
1664 fi
1662 RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" 1665 RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
1663 rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LIBS']]"` 1666 rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LIBS']]"`
1664 if test "X$rubylibs" != "X"; then 1667 if test "X$rubylibs" != "X"; then
1665 RUBY_LIBS="$rubylibs" 1668 RUBY_LIBS="$rubylibs"
1666 fi 1669 fi