Mercurial > vim
comparison src/configure.in @ 5755:9123b4d3ef05 v7.4.222
updated for version 7.4.222
Problem: The Ruby directory is constructed from parts.
Solution: Use 'rubyarchhdrdir' if it exists. (James McCoy)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Thu, 27 Mar 2014 17:19:09 +0100 |
parents | 136f05449f29 |
children | 4b78922d557c |
comparison
equal
deleted
inserted
replaced
5754:a9023919be41 | 5755:9123b4d3ef05 |
---|---|
1690 AC_MSG_CHECKING(Ruby header files) | 1690 AC_MSG_CHECKING(Ruby header files) |
1691 rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e "print $ruby_rbconfig::CONFIG[['rubyhdrdir']] || $ruby_rbconfig::CONFIG[['archdir']] || \\$hdrdir" 2>/dev/null` | 1691 rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e "print $ruby_rbconfig::CONFIG[['rubyhdrdir']] || $ruby_rbconfig::CONFIG[['archdir']] || \\$hdrdir" 2>/dev/null` |
1692 if test "X$rubyhdrdir" != "X"; then | 1692 if test "X$rubyhdrdir" != "X"; then |
1693 AC_MSG_RESULT($rubyhdrdir) | 1693 AC_MSG_RESULT($rubyhdrdir) |
1694 RUBY_CFLAGS="-I$rubyhdrdir" | 1694 RUBY_CFLAGS="-I$rubyhdrdir" |
1695 rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['arch']]"` | 1695 rubyarchdir=`$vi_cv_path_ruby -r rbconfig -e "print ($ruby_rbconfig::CONFIG.has_key? 'rubyarchhdrdir') ? $ruby_rbconfig::CONFIG[['rubyarchhdrdir']] : '$rubyhdrdir/'+$ruby_rbconfig::CONFIG[['arch']]"` |
1696 if test -d "$rubyhdrdir/$rubyarch"; then | 1696 if test -d "$rubyarchdir"; then |
1697 RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" | 1697 RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyarchdir" |
1698 fi | 1698 fi |
1699 rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"` | 1699 rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"` |
1700 if test "X$rubyversion" = "X"; then | 1700 if test "X$rubyversion" = "X"; then |
1701 rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[[0,2]]"` | 1701 rubyversion=`$vi_cv_path_ruby -e "print ((VERSION rescue RUBY_VERSION)).gsub(/\./, '')[[0,2]]"` |
1702 fi | 1702 fi |