6.2.233

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.233
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 6.2.233
  11 Problem:    On Mac OSX adding -pthread for Python only generates a warning.
  12             The test for Perl threads rejects Perl while it's OK.
  13             Tcl doesn't work at all.
  14             The test for Ruby fails if ruby exists but there are no header
  15             files.  The Ruby library isn't detected properly
  16 Solution:   Avoid adding -pthread on Mac OSX.  Accept Perl threads when it's
  17             not the 5.5 threads.
  18             Use the Tcl framework for header files.  For Ruby rename cWindow
  19             to cVimWindow to avoid a name clash. (Ken Scott)
  20             Only enable Ruby when the header files can be found.  Use "-lruby"
  21             instead of "libruby.a" when it can't be found.
  22 Files:      src/auto/configure, src/configure.in, src/if_ruby.c
  23
  24
  25 *** ../vim-6.2.232/src/auto/configure   Mon Dec 29 21:00:25 2003
  26 --- src/auto/configure  Tue Feb  3 22:38:27 2004
  27 ***************
  28 *** 1570,1579 ****
  29
  30     if test "X$vi_cv_path_perl" != "X"; then
  31       echo $ac_n "checking Perl version""... $ac_c" 1>&6
  32 ! echo "configure:1480: checking Perl version" >&5
  33       if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then
  34        eval `$vi_cv_path_perl -V:usethreads`
  35        if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then
  36         echo "$ac_t""OK" 1>&6
  37         eval `$vi_cv_path_perl -V:shrpenv`
  38         if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04
  39 --- 1570,1595 ----
  40
  41     if test "X$vi_cv_path_perl" != "X"; then
  42       echo $ac_n "checking Perl version""... $ac_c" 1>&6
  43 ! echo "configure:1574: checking Perl version" >&5
  44       if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then
  45        eval `$vi_cv_path_perl -V:usethreads`
  46        if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then
  47 +        badthreads=no
  48 +      else
  49 +        if $vi_cv_path_perl -e 'require 5.6.0' >/dev/null 2>/dev/null; then
  50 +        eval `$vi_cv_path_perl -V:use5005threads`
  51 +        if test "X$use5005threads" = "XUNKNOWN" -o "X$use5005threads" = "Xundef"; then
  52 +          badthreads=no
  53 +        else
  54 +          badthreads=yes
  55 +          echo "$ac_t"">>> Perl > 5.6 with 5.5 threads cannot be used <<<" 1>&6
  56 +        fi
  57 +        else
  58 +        badthreads=yes
  59 +        echo "$ac_t"">>> Perl 5.5 with threads cannot be used <<<" 1>&6
  60 +        fi
  61 +      fi
  62 +      if test $badthreads = no; then
  63         echo "$ac_t""OK" 1>&6
  64         eval `$vi_cv_path_perl -V:shrpenv`
  65         if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04
  66 ***************
  67 *** 1602,1609 ****
  68   #define FEAT_PERL 1
  69   EOF
  70
  71 -      else
  72 -       echo "$ac_t"">>> Perl with threads cannot be used <<<" 1>&6
  73        fi
  74       else
  75         echo "$ac_t"">>> too old; need Perl version 5.003_01 or later <<<" 1>&6
  76 --- 1618,1623 ----
  77 ***************
  78 *** 1623,1632 ****
  79         fi
  80       fi
  81       if test -n "$PERL"; then
  82 !       PERL_DIR=$dir
  83 !       PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE
  84 !       PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a
  85 !       PERL_LIBS=-L$darwindir/CORE -lperl
  86       fi
  87     fi
  88   fi
  89 --- 1637,1646 ----
  90         fi
  91       fi
  92       if test -n "$PERL"; then
  93 !       PERL_DIR="$dir"
  94 !       PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
  95 !       PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
  96 !       PERL_LIBS="-L$darwindir/CORE -lperl"
  97       fi
  98     fi
  99   fi
 100 ***************
 101 *** 1810,1829 ****
 102           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
 103         fi
 104         PYTHON_SRC="if_python.c"
 105 !       PYTHON_OBJ="objects/if_python.o objects/py_config.o"
 106         if test "${vi_cv_var_python_version}" = "1.4"; then
 107            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
 108         fi
 109         PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
 110
 111 !                                                       echo $ac_n "checking if -pthread should be used""... $ac_c" 1>&6
 112 ! echo "configure:1702: checking if -pthread should be used" >&5
 113         threadsafe_flag=
 114         thread_lib=
 115 !       test "$GCC" = yes && threadsafe_flag="-pthread"
 116 !       if test "`(uname) 2>/dev/null`" = FreeBSD; then
 117 !         threadsafe_flag="-D_THREAD_SAFE"
 118 !         thread_lib="-pthread"
 119         fi
 120         if test -n "$threadsafe_flag"; then
 121           cflags_save=$CFLAGS
 122 --- 1824,1849 ----
 123           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
 124         fi
 125         PYTHON_SRC="if_python.c"
 126 !               if test "x$MACOSX" = "xyes"; then
 127 !         PYTHON_OBJ="objects/if_python.o"
 128 !       else
 129 !         PYTHON_OBJ="objects/if_python.o objects/py_config.o"
 130 !       fi
 131         if test "${vi_cv_var_python_version}" = "1.4"; then
 132            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
 133         fi
 134         PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
 135
 136 !                                                               echo $ac_n "checking if -pthread should be used""... $ac_c" 1>&6
 137 ! echo "configure:1839: checking if -pthread should be used" >&5
 138         threadsafe_flag=
 139         thread_lib=
 140 !       if test "x$MACOSX" != "xyes"; then
 141 !         test "$GCC" = yes && threadsafe_flag="-pthread"
 142 !         if test "`(uname) 2>/dev/null`" = FreeBSD; then
 143 !           threadsafe_flag="-D_THREAD_SAFE"
 144 !           thread_lib="-pthread"
 145 !         fi
 146         fi
 147         if test -n "$threadsafe_flag"; then
 148           cflags_save=$CFLAGS
 149 ***************
 150 *** 2011,2025 ****
 151     fi
 152     if test "X$vi_cv_path_tcl" != "X"; then
 153       echo $ac_n "checking Tcl version""... $ac_c" 1>&6
 154 ! echo "configure:1896: checking Tcl version" >&5
 155       if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then
 156         tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
 157         echo "$ac_t""$tclver - OK" 1>&6;
 158         tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -`
 159
 160         echo $ac_n "checking for location of Tcl include""... $ac_c" 1>&6
 161 ! echo "configure:1903: checking for location of Tcl include" >&5
 162 !       tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include"
 163         for try in $tclinc; do
 164         if test -f "$try/tcl.h"; then
 165           echo "$ac_t""$try/tcl.h" 1>&6
 166 --- 2031,2049 ----
 167     fi
 168     if test "X$vi_cv_path_tcl" != "X"; then
 169       echo $ac_n "checking Tcl version""... $ac_c" 1>&6
 170 ! echo "configure:2035: checking Tcl version" >&5
 171       if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then
 172         tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
 173         echo "$ac_t""$tclver - OK" 1>&6;
 174         tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -`
 175
 176         echo $ac_n "checking for location of Tcl include""... $ac_c" 1>&6
 177 ! echo "configure:2042: checking for location of Tcl include" >&5
 178 !       if test "x$MACOSX" != "xyes"; then
 179 !         tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include"
 180 !       else
 181 !               tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
 182 !       fi
 183         for try in $tclinc; do
 184         if test -f "$try/tcl.h"; then
 185           echo "$ac_t""$try/tcl.h" 1>&6
 186 ***************
 187 *** 2033,2040 ****
 188         fi
 189         if test -z "$SKIP_TCL"; then
 190         echo $ac_n "checking for location of tclConfig.sh script""... $ac_c" 1>&6
 191 ! echo "configure:1918: checking for location of tclConfig.sh script" >&5
 192 !       tclcnf=`echo $tclinc | sed s/include/lib/g`
 193         for try in $tclcnf; do
 194           if test -f $try/tclConfig.sh; then
 195             echo "$ac_t""$try/tclConfig.sh" 1>&6
 196 --- 2057,2068 ----
 197         fi
 198         if test -z "$SKIP_TCL"; then
 199         echo $ac_n "checking for location of tclConfig.sh script""... $ac_c" 1>&6
 200 ! echo "configure:2061: checking for location of tclConfig.sh script" >&5
 201 !       if test "x$MACOSX" != "xyes"; then
 202 !         tclcnf=`echo $tclinc | sed s/include/lib/g`
 203 !       else
 204 !                 tclcnf="/System/Library/Frameworks/Tcl.framework"
 205 !       fi
 206         for try in $tclcnf; do
 207           if test -f $try/tclConfig.sh; then
 208             echo "$ac_t""$try/tclConfig.sh" 1>&6
 209 ***************
 210 *** 2141,2176 ****
 211
 212     if test "X$vi_cv_path_ruby" != "X"; then
 213       echo $ac_n "checking Ruby version""... $ac_c" 1>&6
 214 ! echo "configure:2026: checking Ruby version" >&5
 215       if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
 216         echo "$ac_t""OK" 1>&6
 217 !       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir'`
 218 !       RUBY_CFLAGS="-I$rubyhdrdir"
 219 !       rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'`
 220 !       if test "X$rubylibs" != "X"; then
 221 !       RUBY_LIBS="$rubylibs"
 222 !       fi
 223 !       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'`
 224 !       if test -f "$rubyhdrdir/$librubyarg"; then
 225 !       librubyarg="$rubyhdrdir/$librubyarg"
 226 !       else
 227 !       librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
 228 !       fi
 229
 230 !       if test "X$librubyarg" != "X"; then
 231 !       RUBY_LIBS="$librubyarg $RUBY_LIBS"
 232 !       fi
 233 !       rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
 234 !       if test "X$rubyldflags" != "X"; then
 235 !       LDFLAGS="$rubyldflags $LDFLAGS"
 236 !       fi
 237 !       RUBY_SRC="if_ruby.c"
 238 !       RUBY_OBJ="objects/if_ruby.o"
 239 !       RUBY_PRO="if_ruby.pro"
 240 !       cat >> confdefs.h <<\EOF
 241   #define FEAT_RUBY 1
 242   EOF
 243
 244       else
 245         echo "$ac_t""too old; need Ruby version 1.6.0 or later" 1>&6
 246       fi
 247 --- 2169,2218 ----
 248
 249     if test "X$vi_cv_path_ruby" != "X"; then
 250       echo $ac_n "checking Ruby version""... $ac_c" 1>&6
 251 ! echo "configure:2173: checking Ruby version" >&5
 252       if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
 253         echo "$ac_t""OK" 1>&6
 254 !       echo $ac_n "checking Ruby header files""... $ac_c" 1>&6
 255 ! echo "configure:2177: checking Ruby header files" >&5
 256 !       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null`
 257 !       if test "X$rubyhdrdir" != "X"; then
 258 !       echo "$ac_t""$rubyhdrdir" 1>&6
 259 !       RUBY_CFLAGS="-I$rubyhdrdir"
 260 !       rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'`
 261 !       if test "X$rubylibs" != "X"; then
 262 !         RUBY_LIBS="$rubylibs"
 263 !       fi
 264 !       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'`
 265 !       if test -f "$rubyhdrdir/$librubyarg"; then
 266 !         librubyarg="$rubyhdrdir/$librubyarg"
 267 !       else
 268 !         rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'`
 269 !         if test -f "$rubylibdir/$librubyarg"; then
 270 !           librubyarg="$rubylibdir/$librubyarg"
 271 !         elif test "$librubyarg" = "libruby.a"; then
 272 !                   librubyarg="-lruby"
 273 !         else
 274 !           librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
 275 !         fi
 276 !       fi
 277
 278 !       if test "X$librubyarg" != "X"; then
 279 !         RUBY_LIBS="$librubyarg $RUBY_LIBS"
 280 !       fi
 281 !       rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
 282 !       if test "X$rubyldflags" != "X"; then
 283 !         LDFLAGS="$rubyldflags $LDFLAGS"
 284 !       fi
 285 !       RUBY_SRC="if_ruby.c"
 286 !       RUBY_OBJ="objects/if_ruby.o"
 287 !       RUBY_PRO="if_ruby.pro"
 288 !       cat >> confdefs.h <<\EOF
 289   #define FEAT_RUBY 1
 290   EOF
 291
 292 +       else
 293 +       echo "$ac_t""not found" 1>&6
 294 +       fi
 295       else
 296         echo "$ac_t""too old; need Ruby version 1.6.0 or later" 1>&6
 297       fi
 298 *** ../vim-6.2.232/src/configure.in     Mon Dec 29 21:00:25 2003
 299 --- src/configure.in    Tue Feb  3 22:38:25 2004
 300 ***************
 301 *** 305,310 ****
 302 --- 305,326 ----
 303       if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then
 304        eval `$vi_cv_path_perl -V:usethreads`
 305        if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then
 306 +        badthreads=no
 307 +      else
 308 +        if $vi_cv_path_perl -e 'require 5.6.0' >/dev/null 2>/dev/null; then
 309 +        eval `$vi_cv_path_perl -V:use5005threads`
 310 +        if test "X$use5005threads" = "XUNKNOWN" -o "X$use5005threads" = "Xundef"; then
 311 +          badthreads=no
 312 +        else
 313 +          badthreads=yes
 314 +          AC_MSG_RESULT(>>> Perl > 5.6 with 5.5 threads cannot be used <<<)
 315 +        fi
 316 +        else
 317 +        badthreads=yes
 318 +        AC_MSG_RESULT(>>> Perl 5.5 with threads cannot be used <<<)
 319 +        fi
 320 +      fi
 321 +      if test $badthreads = no; then
 322         AC_MSG_RESULT(OK)
 323         eval `$vi_cv_path_perl -V:shrpenv`
 324         if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04
 325 ***************
 326 *** 334,341 ****
 327         PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o"
 328         PERL_PRO="if_perl.pro if_perlsfio.pro"
 329         AC_DEFINE(FEAT_PERL)
 330 -      else
 331 -       AC_MSG_RESULT(>>> Perl with threads cannot be used <<<)
 332        fi
 333       else
 334         AC_MSG_RESULT(>>> too old; need Perl version 5.003_01 or later <<<)
 335 --- 350,355 ----
 336 ***************
 337 *** 357,366 ****
 338         fi
 339       fi
 340       if test -n "$PERL"; then
 341 !       PERL_DIR=$dir
 342 !       PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE
 343 !       PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a
 344 !       PERL_LIBS=-L$darwindir/CORE -lperl
 345       fi
 346     fi
 347   fi
 348 --- 371,380 ----
 349         fi
 350       fi
 351       if test -n "$PERL"; then
 352 !       PERL_DIR="$dir"
 353 !       PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
 354 !       PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
 355 !       PERL_LIBS="-L$darwindir/CORE -lperl"
 356       fi
 357     fi
 358   fi
 359 ***************
 360 *** 475,481 ****
 361           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
 362         fi
 363         PYTHON_SRC="if_python.c"
 364 !       PYTHON_OBJ="objects/if_python.o objects/py_config.o"
 365         if test "${vi_cv_var_python_version}" = "1.4"; then
 366            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
 367         fi
 368 --- 489,500 ----
 369           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
 370         fi
 371         PYTHON_SRC="if_python.c"
 372 !       dnl For Mac OSX 10.2 config.o is included in the Python library.
 373 !       if test "x$MACOSX" = "xyes"; then
 374 !         PYTHON_OBJ="objects/if_python.o"
 375 !       else
 376 !         PYTHON_OBJ="objects/if_python.o objects/py_config.o"
 377 !       fi
 378         if test "${vi_cv_var_python_version}" = "1.4"; then
 379            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
 380         fi
 381 ***************
 382 *** 487,499 ****
 383         dnl sigaltstack() will look in libc_r (it's there in libc!).
 384         dnl Otherwise, when using GCC, try adding -pthread to $CFLAGS.  GCC
 385         dnl will then define target-specific defines, e.g., -D_REENTRANT.
 386         AC_MSG_CHECKING([if -pthread should be used])
 387         threadsafe_flag=
 388         thread_lib=
 389 !       test "$GCC" = yes && threadsafe_flag="-pthread"
 390 !       if test "`(uname) 2>/dev/null`" = FreeBSD; then
 391 !         threadsafe_flag="-D_THREAD_SAFE"
 392 !         thread_lib="-pthread"
 393         fi
 394         if test -n "$threadsafe_flag"; then
 395           cflags_save=$CFLAGS
 396 --- 506,521 ----
 397         dnl sigaltstack() will look in libc_r (it's there in libc!).
 398         dnl Otherwise, when using GCC, try adding -pthread to $CFLAGS.  GCC
 399         dnl will then define target-specific defines, e.g., -D_REENTRANT.
 400 +       dnl Don't do this for Mac OSX, -pthread will generate a warning.
 401         AC_MSG_CHECKING([if -pthread should be used])
 402         threadsafe_flag=
 403         thread_lib=
 404 !       if test "x$MACOSX" != "xyes"; then
 405 !         test "$GCC" = yes && threadsafe_flag="-pthread"
 406 !         if test "`(uname) 2>/dev/null`" = FreeBSD; then
 407 !           threadsafe_flag="-D_THREAD_SAFE"
 408 !           thread_lib="-pthread"
 409 !         fi
 410         fi
 411         if test -n "$threadsafe_flag"; then
 412           cflags_save=$CFLAGS
 413 ***************
 414 *** 558,564 ****
 415         tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
 416
 417         AC_MSG_CHECKING(for location of Tcl include)
 418 !       tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include"
 419         for try in $tclinc; do
 420         if test -f "$try/tcl.h"; then
 421           AC_MSG_RESULT($try/tcl.h)
 422 --- 580,591 ----
 423         tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
 424
 425         AC_MSG_CHECKING(for location of Tcl include)
 426 !       if test "x$MACOSX" != "xyes"; then
 427 !         tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include"
 428 !       else
 429 !       dnl For Mac OS X 10.3, use the OS-provided framework location
 430 !       tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
 431 !       fi
 432         for try in $tclinc; do
 433         if test -f "$try/tcl.h"; then
 434           AC_MSG_RESULT($try/tcl.h)
 435 ***************
 436 *** 572,578 ****
 437         fi
 438         if test -z "$SKIP_TCL"; then
 439         AC_MSG_CHECKING(for location of tclConfig.sh script)
 440 !       tclcnf=`echo $tclinc | sed s/include/lib/g`
 441         for try in $tclcnf; do
 442           if test -f $try/tclConfig.sh; then
 443             AC_MSG_RESULT($try/tclConfig.sh)
 444 --- 599,610 ----
 445         fi
 446         if test -z "$SKIP_TCL"; then
 447         AC_MSG_CHECKING(for location of tclConfig.sh script)
 448 !       if test "x$MACOSX" != "xyes"; then
 449 !         tclcnf=`echo $tclinc | sed s/include/lib/g`
 450 !       else
 451 !         dnl For Mac OS X 10.3, use the OS-provided framework location
 452 !         tclcnf="/System/Library/Frameworks/Tcl.framework"
 453 !       fi
 454         for try in $tclcnf; do
 455           if test -f $try/tclConfig.sh; then
 456             AC_MSG_RESULT($try/tclConfig.sh)
 457 ***************
 458 *** 638,667 ****
 459       AC_MSG_CHECKING(Ruby version)
 460       if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
 461         AC_MSG_RESULT(OK)
 462 !       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir'`
 463 !       RUBY_CFLAGS="-I$rubyhdrdir"
 464 !       rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
 465 !       if test "X$rubylibs" != "X"; then
 466 !       RUBY_LIBS="$rubylibs"
 467 !       fi
 468 !       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
 469 !       if test -f "$rubyhdrdir/$librubyarg"; then
 470 !       librubyarg="$rubyhdrdir/$librubyarg"
 471 !       else
 472 !       librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
 473 !       fi
 474
 475 !       if test "X$librubyarg" != "X"; then
 476 !       RUBY_LIBS="$librubyarg $RUBY_LIBS"
 477 !       fi
 478 !       rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
 479 !       if test "X$rubyldflags" != "X"; then
 480 !       LDFLAGS="$rubyldflags $LDFLAGS"
 481         fi
 482 -       RUBY_SRC="if_ruby.c"
 483 -       RUBY_OBJ="objects/if_ruby.o"
 484 -       RUBY_PRO="if_ruby.pro"
 485 -       AC_DEFINE(FEAT_RUBY)
 486       else
 487         AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
 488       fi
 489 --- 670,713 ----
 490       AC_MSG_CHECKING(Ruby version)
 491       if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
 492         AC_MSG_RESULT(OK)
 493 !       AC_MSG_CHECKING(Ruby header files)
 494 !       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
 495 !       if test "X$rubyhdrdir" != "X"; then
 496 !       AC_MSG_RESULT($rubyhdrdir)
 497 !       RUBY_CFLAGS="-I$rubyhdrdir"
 498 !       rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
 499 !       if test "X$rubylibs" != "X"; then
 500 !         RUBY_LIBS="$rubylibs"
 501 !       fi
 502 !       librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
 503 !       if test -f "$rubyhdrdir/$librubyarg"; then
 504 !         librubyarg="$rubyhdrdir/$librubyarg"
 505 !       else
 506 !         rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
 507 !         if test -f "$rubylibdir/$librubyarg"; then
 508 !           librubyarg="$rubylibdir/$librubyarg"
 509 !         elif test "$librubyarg" = "libruby.a"; then
 510 !           dnl required on Mac OS 10.3 where libruby.a doesn't exist
 511 !           librubyarg="-lruby"
 512 !         else
 513 !           librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
 514 !         fi
 515 !       fi
 516
 517 !       if test "X$librubyarg" != "X"; then
 518 !         RUBY_LIBS="$librubyarg $RUBY_LIBS"
 519 !       fi
 520 !       rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
 521 !       if test "X$rubyldflags" != "X"; then
 522 !         LDFLAGS="$rubyldflags $LDFLAGS"
 523 !       fi
 524 !       RUBY_SRC="if_ruby.c"
 525 !       RUBY_OBJ="objects/if_ruby.o"
 526 !       RUBY_PRO="if_ruby.pro"
 527 !       AC_DEFINE(FEAT_RUBY)
 528 !       else
 529 !       AC_MSG_RESULT(not found, disabling Ruby)
 530         fi
 531       else
 532         AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
 533       fi
 534 *** ../vim-6.2.232/src/if_ruby.c        Sun Aug 10 22:37:55 2003
 535 --- src/if_ruby.c       Wed Feb  4 10:19:53 2004
 536 ***************
 537 *** 50,55 ****
 538 --- 50,63 ----
 539
 540   #undef EXTERN
 541   #undef _
 542 +
 543 + /* T_DATA defined both by Ruby and Mac header files, hack around it... */
 544 + #ifdef FEAT_GUI_MAC
 545 + # define __OPENTRANSPORT__
 546 + # define __OPENTRANSPORTPROTOCOL__
 547 + # define __OPENTRANSPORTPROVIDERS__
 548 + #endif
 549 +
 550   #include "vim.h"
 551   #include "version.h"
 552
 553 ***************
 554 *** 64,70 ****
 555
 556   static VALUE mVIM;
 557   static VALUE cBuffer;
 558 ! static VALUE cWindow;
 559   static VALUE eDeletedBufferError;
 560   static VALUE eDeletedWindowError;
 561
 562 --- 72,78 ----
 563
 564   static VALUE mVIM;
 565   static VALUE cBuffer;
 566 ! static VALUE cVimWindow;
 567   static VALUE eDeletedBufferError;
 568   static VALUE eDeletedWindowError;
 569
 570 ***************
 571 *** 682,688 ****
 572         return (VALUE) win->ruby_ref;
 573       }
 574       else {
 575 !       VALUE obj = Data_Wrap_Struct(cWindow, 0, 0, win);
 576         win->ruby_ref = (void *) obj;
 577         rb_hash_aset(objtbl, rb_obj_id(obj), obj);
 578         return obj;
 579 --- 690,696 ----
 580         return (VALUE) win->ruby_ref;
 581       }
 582       else {
 583 !       VALUE obj = Data_Wrap_Struct(cVimWindow, 0, 0, win);
 584         win->ruby_ref = (void *) obj;
 585         rb_hash_aset(objtbl, rb_obj_id(obj), obj);
 586         return obj;
 587 ***************
 588 *** 843,857 ****
 589       rb_define_method(cBuffer, "delete", buffer_delete, 1);
 590       rb_define_method(cBuffer, "append", buffer_append, 2);
 591
 592 !     cWindow = rb_define_class_under(mVIM, "Window", rb_cObject);
 593 !     rb_define_singleton_method(cWindow, "current", window_s_current, 0);
 594 !     rb_define_singleton_method(cWindow, "count", window_s_count, 0);
 595 !     rb_define_singleton_method(cWindow, "[]", window_s_aref, 1);
 596 !     rb_define_method(cWindow, "buffer", window_buffer, 0);
 597 !     rb_define_method(cWindow, "height", window_height, 0);
 598 !     rb_define_method(cWindow, "height=", window_set_height, 1);
 599 !     rb_define_method(cWindow, "cursor", window_cursor, 0);
 600 !     rb_define_method(cWindow, "cursor=", window_set_cursor, 1);
 601
 602       rb_define_virtual_variable("$curbuf", buffer_s_current, 0);
 603       rb_define_virtual_variable("$curwin", window_s_current, 0);
 604 --- 851,865 ----
 605       rb_define_method(cBuffer, "delete", buffer_delete, 1);
 606       rb_define_method(cBuffer, "append", buffer_append, 2);
 607
 608 !     cVimWindow = rb_define_class_under(mVIM, "Window", rb_cObject);
 609 !     rb_define_singleton_method(cVimWindow, "current", window_s_current, 0);
 610 !     rb_define_singleton_method(cVimWindow, "count", window_s_count, 0);
 611 !     rb_define_singleton_method(cVimWindow, "[]", window_s_aref, 1);
 612 !     rb_define_method(cVimWindow, "buffer", window_buffer, 0);
 613 !     rb_define_method(cVimWindow, "height", window_height, 0);
 614 !     rb_define_method(cVimWindow, "height=", window_set_height, 1);
 615 !     rb_define_method(cVimWindow, "cursor", window_cursor, 0);
 616 !     rb_define_method(cVimWindow, "cursor=", window_set_cursor, 1);
 617
 618       rb_define_virtual_variable("$curbuf", buffer_s_current, 0);
 619       rb_define_virtual_variable("$curwin", window_s_current, 0);
 620 *** ../vim-6.2.232/src/version.c        Tue Feb  3 19:59:05 2004
 621 --- src/version.c       Wed Feb  4 12:04:53 2004
 622 ***************
 623 *** 639,640 ****
 624 --- 639,642 ----
 625   {   /* Add new patch number below this line */
 626 + /**/
 627 +     233,
 628   /**/
 629
 630 --
 631 Everyone has a photographic memory. Some don't have film.
 632
 633  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 634 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 635 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 636  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///