diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-03-27 17:19:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-03-27 17:19:09 +0100 |
| commit | a6fd37be4fa01cef4bc4368f8fa814d9c6d084fd (patch) | |
| tree | c8db3b1d71a009ae2628587abc0d666ae4ec61a0 | |
| parent | 158864120d3ee8baa2b5c9c2cb15bd5c5ea5731b (diff) | |
updated for version 7.4.222v7.4.222
Problem: The Ruby directory is constructed from parts.
Solution: Use 'rubyarchhdrdir' if it exists. (James McCoy)
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.in | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index d0bee7bedb..f8f3598819 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -6777,9 +6777,9 @@ $as_echo_n "checking Ruby header files... " >&6; } { $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 diff --git a/src/configure.in b/src/configure.in index cf693505a0..ac6eb45090 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1692,9 +1692,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then if test "X$rubyhdrdir" != "X"; then AC_MSG_RESULT($rubyhdrdir) 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 diff --git a/src/version.c b/src/version.c index 2c64b2b332..3d352543f1 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 222, +/**/ 221, /**/ 220, |