home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.176 < prev    next >
Encoding:
Internet Message Format  |  2012-11-20  |  6.8 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.176
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.176
  11. Problem:    Ruby linking doesn't work properly on Mac OS X.
  12. Solution:   Fix the configure check for Ruby. (Bjorn Winckler)
  13. Files:        src/configure.in, src/auto/configure
  14.  
  15.  
  16. *** ../vim-7.3.175/src/configure.in    2011-05-05 17:23:58.000000000 +0200
  17. --- src/configure.in    2011-05-05 18:03:38.000000000 +0200
  18. ***************
  19. *** 1387,1396 ****
  20.   AC_MSG_RESULT($enable_rubyinterp)
  21.   if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
  22.     AC_MSG_CHECKING(--with-ruby-command argument)
  23.     AC_ARG_WITH(ruby-command, [  --with-ruby-command=RUBY  name of the Ruby command (default: ruby)],
  24. !     RUBY_CMD="$withval"; AC_MSG_RESULT($RUBY_CMD),
  25.       RUBY_CMD="ruby"; AC_MSG_RESULT(defaulting to $RUBY_CMD))
  26. -   AC_SUBST(vi_cv_path_ruby)
  27.     AC_PATH_PROG(vi_cv_path_ruby, $RUBY_CMD)
  28.     if test "X$vi_cv_path_ruby" != "X"; then
  29.       AC_MSG_CHECKING(Ruby version)
  30. --- 1387,1396 ----
  31.   AC_MSG_RESULT($enable_rubyinterp)
  32.   if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
  33.     AC_MSG_CHECKING(--with-ruby-command argument)
  34. +   AC_SUBST(vi_cv_path_ruby)
  35.     AC_ARG_WITH(ruby-command, [  --with-ruby-command=RUBY  name of the Ruby command (default: ruby)],
  36. !     RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; AC_MSG_RESULT($RUBY_CMD),
  37.       RUBY_CMD="ruby"; AC_MSG_RESULT(defaulting to $RUBY_CMD))
  38.     AC_PATH_PROG(vi_cv_path_ruby, $RUBY_CMD)
  39.     if test "X$vi_cv_path_ruby" != "X"; then
  40.       AC_MSG_CHECKING(Ruby version)
  41. ***************
  42. *** 1412,1429 ****
  43.         RUBY_LIBS="$rubylibs"
  44.       fi
  45.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
  46. !     if test -f "$rubyhdrdir/$librubyarg"; then
  47. !       librubyarg="$rubyhdrdir/$librubyarg"
  48. !     else
  49. !       rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
  50. !       if test -f "$rubylibdir/$librubyarg"; then
  51. !         librubyarg="$rubylibdir/$librubyarg"
  52. !       elif test "$librubyarg" = "libruby.a"; then
  53. !         dnl required on Mac OS 10.3 where libruby.a doesn't exist
  54. !         librubyarg="-lruby"
  55. !       else
  56. !         librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
  57. !       fi
  58.       fi
  59.   
  60.       if test "X$librubyarg" != "X"; then
  61. --- 1412,1426 ----
  62.         RUBY_LIBS="$rubylibs"
  63.       fi
  64.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
  65. !     librubya=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBY_A"]])'`
  66. !   rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
  67. !     if test -f "$rubylibdir/$librubya"; then
  68. !       librubyarg="$librubyarg"
  69. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  70. !   elif test "$librubyarg" = "libruby.a"; then
  71. !     dnl required on Mac OS 10.3 where libruby.a doesn't exist
  72. !     librubyarg="-lruby"
  73. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  74.       fi
  75.   
  76.       if test "X$librubyarg" != "X"; then
  77. *** ../vim-7.3.175/src/auto/configure    2011-05-05 17:23:58.000000000 +0200
  78. --- src/auto/configure    2011-05-05 18:06:47.000000000 +0200
  79. ***************
  80. *** 6218,6233 ****
  81.     { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5
  82.   $as_echo_n "checking --with-ruby-command argument... " >&6; }
  83.   
  84.   # Check whether --with-ruby-command was given.
  85.   if test "${with_ruby_command+set}" = set; then :
  86. !   withval=$with_ruby_command; RUBY_CMD="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5
  87.   $as_echo "$RUBY_CMD" >&6; }
  88.   else
  89.     RUBY_CMD="ruby"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5
  90.   $as_echo "defaulting to $RUBY_CMD" >&6; }
  91.   fi
  92.   
  93. - 
  94.     # Extract the first word of "$RUBY_CMD", so it can be a program name with args.
  95.   set dummy $RUBY_CMD; ac_word=$2
  96.   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  97. --- 6218,6233 ----
  98.     { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5
  99.   $as_echo_n "checking --with-ruby-command argument... " >&6; }
  100.   
  101. + 
  102.   # Check whether --with-ruby-command was given.
  103.   if test "${with_ruby_command+set}" = set; then :
  104. !   withval=$with_ruby_command; RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5
  105.   $as_echo "$RUBY_CMD" >&6; }
  106.   else
  107.     RUBY_CMD="ruby"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5
  108.   $as_echo "defaulting to $RUBY_CMD" >&6; }
  109.   fi
  110.   
  111.     # Extract the first word of "$RUBY_CMD", so it can be a program name with args.
  112.   set dummy $RUBY_CMD; ac_word=$2
  113.   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  114. ***************
  115. *** 6292,6308 ****
  116.         RUBY_LIBS="$rubylibs"
  117.       fi
  118.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'`
  119. !     if test -f "$rubyhdrdir/$librubyarg"; then
  120. !       librubyarg="$rubyhdrdir/$librubyarg"
  121. !     else
  122. !       rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'`
  123. !       if test -f "$rubylibdir/$librubyarg"; then
  124. !         librubyarg="$rubylibdir/$librubyarg"
  125. !       elif test "$librubyarg" = "libruby.a"; then
  126. !                 librubyarg="-lruby"
  127. !       else
  128. !         librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
  129. !       fi
  130.       fi
  131.   
  132.       if test "X$librubyarg" != "X"; then
  133. --- 6292,6305 ----
  134.         RUBY_LIBS="$rubylibs"
  135.       fi
  136.       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'`
  137. !     librubya=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBY_A"])'`
  138. !   rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'`
  139. !     if test -f "$rubylibdir/$librubya"; then
  140. !       librubyarg="$librubyarg"
  141. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  142. !   elif test "$librubyarg" = "libruby.a"; then
  143. !         librubyarg="-lruby"
  144. !     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
  145.       fi
  146.   
  147.       if test "X$librubyarg" != "X"; then
  148. *** ../vim-7.3.175/src/version.c    2011-05-05 17:32:40.000000000 +0200
  149. --- src/version.c    2011-05-05 18:08:52.000000000 +0200
  150. ***************
  151. *** 716,717 ****
  152. --- 716,719 ----
  153.   {   /* Add new patch number below this line */
  154. + /**/
  155. +     176,
  156.   /**/
  157.  
  158. -- 
  159. "I simultaneously try to keep my head in the clouds and my feet on the
  160. ground.  Sometimes it's a stretch, though."              -- Larry Wall
  161.  
  162.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  163. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  164. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  165.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  166.