Mirror of the Vim source from https://github.com/vim/vim
Revision | ee41e031dfe14ebe50c289158213f05eca869bb1 (tree) |
---|---|
Zeit | 2008-01-02 00:26:45 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.1-179
@@ -4445,7 +4445,7 @@ | ||
4445 | 4445 | tclsh_name="$withval"; echo "$as_me:$LINENO: result: $tclsh_name" >&5 |
4446 | 4446 | echo "${ECHO_T}$tclsh_name" >&6 |
4447 | 4447 | else |
4448 | - tclsh_name="tclsh8.4"; echo "$as_me:$LINENO: result: no" >&5 | |
4448 | + tclsh_name="tclsh8.5"; echo "$as_me:$LINENO: result: no" >&5 | |
4449 | 4449 | echo "${ECHO_T}no" >&6 |
4450 | 4450 | fi; |
4451 | 4451 | # Extract the first word of "$tclsh_name", so it can be a program name with args. |
@@ -4489,7 +4489,49 @@ | ||
4489 | 4489 | |
4490 | 4490 | |
4491 | 4491 | |
4492 | - if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then | |
4492 | + if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.5"; then | |
4493 | + tclsh_name="tclsh8.4" | |
4494 | + # Extract the first word of "$tclsh_name", so it can be a program name with args. | |
4495 | +set dummy $tclsh_name; ac_word=$2 | |
4496 | +echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
4497 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
4498 | +if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then | |
4499 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
4500 | +else | |
4501 | + case $vi_cv_path_tcl in | |
4502 | + [\\/]* | ?:[\\/]*) | |
4503 | + ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. | |
4504 | + ;; | |
4505 | + *) | |
4506 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
4507 | +for as_dir in $PATH | |
4508 | +do | |
4509 | + IFS=$as_save_IFS | |
4510 | + test -z "$as_dir" && as_dir=. | |
4511 | + for ac_exec_ext in '' $ac_executable_extensions; do | |
4512 | + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
4513 | + ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" | |
4514 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
4515 | + break 2 | |
4516 | + fi | |
4517 | +done | |
4518 | +done | |
4519 | + | |
4520 | + ;; | |
4521 | +esac | |
4522 | +fi | |
4523 | +vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl | |
4524 | + | |
4525 | +if test -n "$vi_cv_path_tcl"; then | |
4526 | + echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 | |
4527 | +echo "${ECHO_T}$vi_cv_path_tcl" >&6 | |
4528 | +else | |
4529 | + echo "$as_me:$LINENO: result: no" >&5 | |
4530 | +echo "${ECHO_T}no" >&6 | |
4531 | +fi | |
4532 | + | |
4533 | + fi | |
4534 | + if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then | |
4493 | 4535 | tclsh_name="tclsh8.2" |
4494 | 4536 | # Extract the first word of "$tclsh_name", so it can be a program name with args. |
4495 | 4537 | set dummy $tclsh_name; ac_word=$2 |
@@ -4649,6 +4691,7 @@ | ||
4649 | 4691 | echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6 |
4650 | 4692 | if test "x$MACOSX" != "xyes"; then |
4651 | 4693 | tclcnf=`echo $tclinc | sed s/include/lib/g` |
4694 | + tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" | |
4652 | 4695 | else |
4653 | 4696 | tclcnf="/System/Library/Frameworks/Tcl.framework" |
4654 | 4697 | fi |
@@ -4668,6 +4711,7 @@ | ||
4668 | 4711 | echo "$as_me:$LINENO: checking for Tcl library by myself" >&5 |
4669 | 4712 | echo $ECHO_N "checking for Tcl library by myself... $ECHO_C" >&6 |
4670 | 4713 | tcllib=`echo $tclinc | sed s/include/lib/g` |
4714 | + tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`" | |
4671 | 4715 | for ext in .so .a ; do |
4672 | 4716 | for ver in "" $tclver ; do |
4673 | 4717 | for try in $tcllib ; do |
@@ -759,15 +759,19 @@ | ||
759 | 759 | |
760 | 760 | if test "$enable_tclinterp" = "yes"; then |
761 | 761 | |
762 | - dnl on FreeBSD tclsh is a silly script, look for tclsh8.[420] | |
762 | + dnl on FreeBSD tclsh is a silly script, look for tclsh8.[5420] | |
763 | 763 | AC_MSG_CHECKING(--with-tclsh argument) |
764 | 764 | AC_ARG_WITH(tclsh, [ --with-tclsh=PATH which tclsh to use (default: tclsh8.0)], |
765 | 765 | tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name), |
766 | - tclsh_name="tclsh8.4"; AC_MSG_RESULT(no)) | |
766 | + tclsh_name="tclsh8.5"; AC_MSG_RESULT(no)) | |
767 | 767 | AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name) |
768 | 768 | AC_SUBST(vi_cv_path_tcl) |
769 | 769 | |
770 | - dnl when no specific version specified, also try 8.2 and 8.0 | |
770 | + dnl when no specific version specified, also try 8.4, 8.2 and 8.0 | |
771 | + if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.5"; then | |
772 | + tclsh_name="tclsh8.4" | |
773 | + AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name) | |
774 | + fi | |
771 | 775 | if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then |
772 | 776 | tclsh_name="tclsh8.2" |
773 | 777 | AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name) |
@@ -810,6 +814,7 @@ | ||
810 | 814 | AC_MSG_CHECKING(for location of tclConfig.sh script) |
811 | 815 | if test "x$MACOSX" != "xyes"; then |
812 | 816 | tclcnf=`echo $tclinc | sed s/include/lib/g` |
817 | + tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" | |
813 | 818 | else |
814 | 819 | dnl For Mac OS X 10.3, use the OS-provided framework location |
815 | 820 | tclcnf="/System/Library/Frameworks/Tcl.framework" |
@@ -830,6 +835,7 @@ | ||
830 | 835 | AC_MSG_RESULT(<not found>) |
831 | 836 | AC_MSG_CHECKING(for Tcl library by myself) |
832 | 837 | tcllib=`echo $tclinc | sed s/include/lib/g` |
838 | + tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`" | |
833 | 839 | for ext in .so .a ; do |
834 | 840 | for ver in "" $tclver ; do |
835 | 841 | for try in $tcllib ; do |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 179, | |
671 | +/**/ | |
670 | 672 | 178, |
671 | 673 | /**/ |
672 | 674 | 177, |