|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.222
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.222
|
|
|
3ef2ca |
Problem: The Ruby directory is constructed from parts.
|
|
|
3ef2ca |
Solution: Use 'rubyarchhdrdir' if it exists. (James McCoy)
|
|
|
3ef2ca |
Files: src/configure.in, src/auto/configure
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.221/src/configure.in 2014-02-23 22:52:33.356764716 +0100
|
|
|
3ef2ca |
--- src/configure.in 2014-03-27 17:13:09.624670867 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 1692,1700 ****
|
|
|
3ef2ca |
if test "X$rubyhdrdir" != "X"; then
|
|
|
3ef2ca |
AC_MSG_RESULT($rubyhdrdir)
|
|
|
3ef2ca |
RUBY_CFLAGS="-I$rubyhdrdir"
|
|
|
3ef2ca |
! rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['arch']]"`
|
|
|
3ef2ca |
! if test -d "$rubyhdrdir/$rubyarch"; then
|
|
|
3ef2ca |
! RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
|
|
|
3ef2ca |
fi
|
|
|
3ef2ca |
rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
|
|
|
3ef2ca |
if test "X$rubyversion" = "X"; then
|
|
|
3ef2ca |
--- 1692,1700 ----
|
|
|
3ef2ca |
if test "X$rubyhdrdir" != "X"; then
|
|
|
3ef2ca |
AC_MSG_RESULT($rubyhdrdir)
|
|
|
3ef2ca |
RUBY_CFLAGS="-I$rubyhdrdir"
|
|
|
3ef2ca |
! rubyarchdir=`$vi_cv_path_ruby -r rbconfig -e "print ($ruby_rbconfig::CONFIG.has_key? 'rubyarchhdrdir') ? $ruby_rbconfig::CONFIG[['rubyarchhdrdir']] : '$rubyhdrdir/'+$ruby_rbconfig::CONFIG[['arch']]"`
|
|
|
3ef2ca |
! if test -d "$rubyarchdir"; then
|
|
|
3ef2ca |
! RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyarchdir"
|
|
|
3ef2ca |
fi
|
|
|
3ef2ca |
rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
|
|
|
3ef2ca |
if test "X$rubyversion" = "X"; then
|
|
|
3ef2ca |
*** ../vim-7.4.221/src/auto/configure 2014-02-23 22:52:33.364764715 +0100
|
|
|
3ef2ca |
--- src/auto/configure 2014-03-27 17:14:25.256672026 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 6777,6785 ****
|
|
|
3ef2ca |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5
|
|
|
3ef2ca |
$as_echo "$rubyhdrdir" >&6; }
|
|
|
3ef2ca |
RUBY_CFLAGS="-I$rubyhdrdir"
|
|
|
3ef2ca |
! rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['arch']"`
|
|
|
3ef2ca |
! if test -d "$rubyhdrdir/$rubyarch"; then
|
|
|
3ef2ca |
! RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
|
|
|
3ef2ca |
fi
|
|
|
3ef2ca |
rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"`
|
|
|
3ef2ca |
if test "X$rubyversion" = "X"; then
|
|
|
3ef2ca |
--- 6777,6785 ----
|
|
|
3ef2ca |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5
|
|
|
3ef2ca |
$as_echo "$rubyhdrdir" >&6; }
|
|
|
3ef2ca |
RUBY_CFLAGS="-I$rubyhdrdir"
|
|
|
3ef2ca |
! rubyarchdir=`$vi_cv_path_ruby -r rbconfig -e "print ($ruby_rbconfig::CONFIG.has_key? 'rubyarchhdrdir') ? $ruby_rbconfig::CONFIG['rubyarchhdrdir'] : '$rubyhdrdir/'+$ruby_rbconfig::CONFIG['arch']"`
|
|
|
3ef2ca |
! if test -d "$rubyarchdir"; then
|
|
|
3ef2ca |
! RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyarchdir"
|
|
|
3ef2ca |
fi
|
|
|
3ef2ca |
rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"`
|
|
|
3ef2ca |
if test "X$rubyversion" = "X"; then
|
|
|
3ef2ca |
*** ../vim-7.4.221/src/version.c 2014-03-27 17:02:22.084660944 +0100
|
|
|
3ef2ca |
--- src/version.c 2014-03-27 17:13:29.220671167 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 736,737 ****
|
|
|
3ef2ca |
--- 736,739 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 222,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
Engineers are always delighted to share wisdom, even in areas in which they
|
|
|
3ef2ca |
have no experience whatsoever. Their logic provides them with inherent
|
|
|
3ef2ca |
insight into any field of expertise. This can be a problem when dealing with
|
|
|
3ef2ca |
the illogical people who believe that knowledge can only be derived through
|
|
|
3ef2ca |
experience.
|
|
|
3ef2ca |
(Scott Adams - The Dilbert principle)
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|