To: vim-dev@vim.org Subject: Patch 6.1.438 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.438 Problem: When Perl has thread support Vim cannot use the Perl interface. Solution: Add a configure check and disable Perl when it will not work. (Aron Griffis) Files: src/auto/configure, src/configure.in *** ../vim61.437/src/auto/configure Wed Mar 26 22:12:58 2003 --- src/auto/configure Thu Apr 3 20:30:22 2003 *************** *** 1432,1439 **** if test "X$vi_cv_path_perl" != "X"; then echo $ac_n "checking Perl version""... $ac_c" 1>&6 ! echo "configure:1419: checking Perl version" >&5 if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then echo "$ac_t""OK" 1>&6 eval `$vi_cv_path_perl -V:shrpenv` if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04 --- 1432,1441 ---- if test "X$vi_cv_path_perl" != "X"; then echo $ac_n "checking Perl version""... $ac_c" 1>&6 ! echo "configure:1436: checking Perl version" >&5 if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then + eval `$vi_cv_path_perl -V:usethreads` + if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then echo "$ac_t""OK" 1>&6 eval `$vi_cv_path_perl -V:shrpenv` if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04 *************** *** 1462,1469 **** #define FEAT_PERL 1 EOF else ! echo "$ac_t""too old; need Perl version 5.003_01 or later" 1>&6 fi fi fi --- 1464,1474 ---- #define FEAT_PERL 1 EOF + else + echo "$ac_t"">>> Perl with threads cannot be used <<<" 1>&6 + fi else ! echo "$ac_t"">>> too old; need Perl version 5.003_01 or later <<<" 1>&6 fi fi fi *** ../vim61.437/src/configure.in Wed Mar 26 22:12:58 2003 --- src/configure.in Wed Apr 2 21:52:53 2003 *************** *** 236,241 **** --- 236,243 ---- if test "X$vi_cv_path_perl" != "X"; then AC_MSG_CHECKING(Perl version) if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then + eval `$vi_cv_path_perl -V:usethreads` + if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then AC_MSG_RESULT(OK) eval `$vi_cv_path_perl -V:shrpenv` if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04 *************** *** 264,271 **** PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o" PERL_PRO="if_perl.pro if_perlsfio.pro" AC_DEFINE(FEAT_PERL) else ! AC_MSG_RESULT(too old; need Perl version 5.003_01 or later) fi fi fi --- 266,276 ---- PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o" PERL_PRO="if_perl.pro if_perlsfio.pro" AC_DEFINE(FEAT_PERL) + else + AC_MSG_RESULT(>>> Perl with threads cannot be used <<<) + fi else ! AC_MSG_RESULT(>>> too old; need Perl version 5.003_01 or later <<<) fi fi fi *** ../vim61.437/src/version.c Sun Apr 6 14:28:10 2003 --- src/version.c Sun Apr 6 14:30:02 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 438, /**/ -- ARTHUR: Listen, old crone! Unless you tell us where we can buy a shrubbery, my friend and I will ... we will say "Ni!" CRONE: Do your worst! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///