7.1.179

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.1.179
   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 7.1.179
  11 Problem:    Need to check for TCL 8.5.
  12 Solution:   Adjust configure script. (Alexey Froloff)
  13 Files:      src/configure.in, src/auto/configure
  14
  15
  16 *** ../vim-7.1.178/src/configure.in     Sun Nov  4 15:35:23 2007
  17 --- src/configure.in    Sun Dec 30 13:55:28 2007
  18 ***************
  19 *** 759,773 ****
  20
  21   if test "$enable_tclinterp" = "yes"; then
  22
  23 !   dnl on FreeBSD tclsh is a silly script, look for tclsh8.[420]
  24     AC_MSG_CHECKING(--with-tclsh argument)
  25     AC_ARG_WITH(tclsh, [  --with-tclsh=PATH       which tclsh to use (default: tclsh8.0)],
  26         tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name),
  27 !       tclsh_name="tclsh8.4"; AC_MSG_RESULT(no))
  28     AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
  29     AC_SUBST(vi_cv_path_tcl)
  30
  31 !   dnl when no specific version specified, also try 8.2 and 8.0
  32     if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
  33       tclsh_name="tclsh8.2"
  34       AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
  35 --- 759,777 ----
  36
  37   if test "$enable_tclinterp" = "yes"; then
  38
  39 !   dnl on FreeBSD tclsh is a silly script, look for tclsh8.[5420]
  40     AC_MSG_CHECKING(--with-tclsh argument)
  41     AC_ARG_WITH(tclsh, [  --with-tclsh=PATH       which tclsh to use (default: tclsh8.0)],
  42         tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name),
  43 !       tclsh_name="tclsh8.5"; AC_MSG_RESULT(no))
  44     AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
  45     AC_SUBST(vi_cv_path_tcl)
  46
  47 !   dnl when no specific version specified, also try 8.4, 8.2 and 8.0
  48 !   if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.5"; then
  49 !     tclsh_name="tclsh8.4"
  50 !     AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
  51 !   fi
  52     if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
  53       tclsh_name="tclsh8.2"
  54       AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
  55 ***************
  56 *** 810,815 ****
  57 --- 814,820 ----
  58         AC_MSG_CHECKING(for location of tclConfig.sh script)
  59         if test "x$MACOSX" != "xyes"; then
  60           tclcnf=`echo $tclinc | sed s/include/lib/g`
  61 +         tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
  62         else
  63           dnl For Mac OS X 10.3, use the OS-provided framework location
  64           tclcnf="/System/Library/Frameworks/Tcl.framework"
  65 ***************
  66 *** 830,835 ****
  67 --- 835,841 ----
  68           AC_MSG_RESULT(<not found>)
  69           AC_MSG_CHECKING(for Tcl library by myself)
  70           tcllib=`echo $tclinc | sed s/include/lib/g`
  71 +         tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`"
  72           for ext in .so .a ; do
  73             for ver in "" $tclver ; do
  74               for try in $tcllib ; do
  75 *** ../vim-7.1.178/src/auto/configure   Sun Nov  4 15:35:23 2007
  76 --- src/auto/configure  Sun Dec 30 13:55:35 2007
  77 ***************
  78 *** 4445,4451 ****
  79     tclsh_name="$withval"; echo "$as_me:$LINENO: result: $tclsh_name" >&5
  80   echo "${ECHO_T}$tclsh_name" >&6
  81   else
  82 !   tclsh_name="tclsh8.4"; echo "$as_me:$LINENO: result: no" >&5
  83   echo "${ECHO_T}no" >&6
  84   fi;
  85     # Extract the first word of "$tclsh_name", so it can be a program name with args.
  86 --- 4445,4451 ----
  87     tclsh_name="$withval"; echo "$as_me:$LINENO: result: $tclsh_name" >&5
  88   echo "${ECHO_T}$tclsh_name" >&6
  89   else
  90 !   tclsh_name="tclsh8.5"; echo "$as_me:$LINENO: result: no" >&5
  91   echo "${ECHO_T}no" >&6
  92   fi;
  93     # Extract the first word of "$tclsh_name", so it can be a program name with args.
  94 ***************
  95 *** 4489,4495 ****
  96
  97
  98
  99 !     if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
 100       tclsh_name="tclsh8.2"
 101       # Extract the first word of "$tclsh_name", so it can be a program name with args.
 102   set dummy $tclsh_name; ac_word=$2
 103 --- 4489,4537 ----
 104
 105
 106
 107 !     if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.5"; then
 108 !     tclsh_name="tclsh8.4"
 109 !     # Extract the first word of "$tclsh_name", so it can be a program name with args.
 110 ! set dummy $tclsh_name; ac_word=$2
 111 ! echo "$as_me:$LINENO: checking for $ac_word" >&5
 112 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 113 ! if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then
 114 !   echo $ECHO_N "(cached) $ECHO_C" >&6
 115 ! else
 116 !   case $vi_cv_path_tcl in
 117 !   [\\/]* | ?:[\\/]*)
 118 !   ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path.
 119 !   ;;
 120 !   *)
 121 !   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 122 ! for as_dir in $PATH
 123 ! do
 124 !   IFS=$as_save_IFS
 125 !   test -z "$as_dir" && as_dir=.
 126 !   for ac_exec_ext in '' $ac_executable_extensions; do
 127 !   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 128 !     ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
 129 !     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 130 !     break 2
 131 !   fi
 132 ! done
 133 ! done
 134 !
 135 !   ;;
 136 ! esac
 137 ! fi
 138 ! vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl
 139 !
 140 ! if test -n "$vi_cv_path_tcl"; then
 141 !   echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
 142 ! echo "${ECHO_T}$vi_cv_path_tcl" >&6
 143 ! else
 144 !   echo "$as_me:$LINENO: result: no" >&5
 145 ! echo "${ECHO_T}no" >&6
 146 ! fi
 147 !
 148 !   fi
 149 !   if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
 150       tclsh_name="tclsh8.2"
 151       # Extract the first word of "$tclsh_name", so it can be a program name with args.
 152   set dummy $tclsh_name; ac_word=$2
 153 ***************
 154 *** 4649,4654 ****
 155 --- 4691,4697 ----
 156   echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6
 157         if test "x$MACOSX" != "xyes"; then
 158           tclcnf=`echo $tclinc | sed s/include/lib/g`
 159 +         tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
 160         else
 161                   tclcnf="/System/Library/Frameworks/Tcl.framework"
 162         fi
 163 ***************
 164 *** 4668,4673 ****
 165 --- 4711,4717 ----
 166           echo "$as_me:$LINENO: checking for Tcl library by myself" >&5
 167   echo $ECHO_N "checking for Tcl library by myself... $ECHO_C" >&6
 168           tcllib=`echo $tclinc | sed s/include/lib/g`
 169 +         tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`"
 170           for ext in .so .a ; do
 171             for ver in "" $tclver ; do
 172               for try in $tcllib ; do
 173 *** ../vim-7.1.178/src/version.c        Tue Jan  1 15:42:45 2008
 174 --- src/version.c       Tue Jan  1 16:24:07 2008
 175 ***************
 176 *** 668,669 ****
 177 --- 668,671 ----
 178   {   /* Add new patch number below this line */
 179 + /**/
 180 +     179,
 181   /**/
 182
 183 --
 184 Just think of all the things we haven't thought of yet.
 185
 186  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 187 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 188 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 189  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///