To: vim-dev@vim.org Subject: Patch 6.2f.001 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.2f.001 Problem: The configure check for Ruby didn't work properly for Ruby 1.8.0. Solution: Change the way the Ruby check is done. (Aron Griffis) Files: src/auto/configure, src/configure.in *** ../vim-6.2f/src/auto/configure Sun May 25 18:14:26 2003 --- src/auto/configure Sun May 25 22:56:31 2003 *************** *** 2028,2037 **** RUBY_LIBS="$rubylibs" fi librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'` ! if test "`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[\"ENABLE_SHARED\"]'`" = "yes"; then ! librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` ! else librubyarg="$rubyhdrdir/$librubyarg" fi if test "X$librubyarg" != "X"; then --- 2028,2037 ---- RUBY_LIBS="$rubylibs" fi librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'` ! if test -f "$rubyhdrdir/$librubyarg"; then librubyarg="$rubyhdrdir/$librubyarg" + else + librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` fi if test "X$librubyarg" != "X"; then *** ../vim-6.2f/src/configure.in Sun May 25 18:07:28 2003 --- src/configure.in Sun May 25 22:56:25 2003 *************** *** 567,576 **** RUBY_LIBS="$rubylibs" fi librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'` ! if test "`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[[\"ENABLE_SHARED\"]]'`" = "yes"; then ! librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` ! else librubyarg="$rubyhdrdir/$librubyarg" fi if test "X$librubyarg" != "X"; then --- 567,576 ---- RUBY_LIBS="$rubylibs" fi librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'` ! if test -f "$rubyhdrdir/$librubyarg"; then librubyarg="$rubyhdrdir/$librubyarg" + else + librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` fi if test "X$librubyarg" != "X"; then *** ../vim-6.2f/src/version.c Sat May 24 13:47:13 2003 --- src/version.c Mon May 26 22:10:34 2003 *************** *** 632,633 **** --- 632,635 ---- { /* Add new patch number below this line */ + /**/ + 1, /**/ -- "Beware of bugs in the above code; I have only proved it correct, not tried it." -- Donald Knuth /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///