Mercurial > vim
diff src/auto/configure @ 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 |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -6777,9 +6777,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5 $as_echo "$rubyhdrdir" >&6; } RUBY_CFLAGS="-I$rubyhdrdir" - rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['arch']"` - if test -d "$rubyhdrdir/$rubyarch"; then - RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" + rubyarchdir=`$vi_cv_path_ruby -r rbconfig -e "print ($ruby_rbconfig::CONFIG.has_key? 'rubyarchhdrdir') ? $ruby_rbconfig::CONFIG['rubyarchhdrdir'] : '$rubyhdrdir/'+$ruby_rbconfig::CONFIG['arch']"` + if test -d "$rubyarchdir"; then + RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyarchdir" fi rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"` if test "X$rubyversion" = "X"; then