318c03d
To: vim-dev@vim.org
318c03d
Subject: Patch 7.1.257
318c03d
Fcc: outbox
318c03d
From: Bram Moolenaar <Bram@moolenaar.net>
318c03d
Mime-Version: 1.0
318c03d
Content-Type: text/plain; charset=ISO-8859-1
318c03d
Content-Transfer-Encoding: 8bit
318c03d
------------
318c03d
318c03d
Patch 7.1.257
318c03d
Problem:    Configure can't always find the Tcl header files.
318c03d
Solution:   Also look in /usr/local/include/tcl$tclver and
318c03d
	    /usr/include/tcl$tclver (James Vega)
318c03d
Files:	    src/auto/configure, src/configure.in
318c03d
318c03d
318c03d
*** ../vim-7.1.256/src/auto/configure	Wed Feb 13 10:27:28 2008
318c03d
--- src/auto/configure	Wed Feb 13 11:20:00 2008
318c03d
***************
318c03d
*** 4669,4678 ****
318c03d
        echo "$as_me:$LINENO: checking for location of Tcl include" >&5
318c03d
  echo $ECHO_N "checking for location of Tcl include... $ECHO_C" >&6
318c03d
        if test "x$MACOSX" != "xyes"; then
318c03d
! 	tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/include"
318c03d
        else
318c03d
  		tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
318c03d
        fi
318c03d
        for try in $tclinc; do
318c03d
  	if test -f "$try/tcl.h"; then
318c03d
  	  echo "$as_me:$LINENO: result: $try/tcl.h" >&5
318c03d
--- 4669,4679 ----
318c03d
        echo "$as_me:$LINENO: checking for location of Tcl include" >&5
318c03d
  echo $ECHO_N "checking for location of Tcl include... $ECHO_C" >&6
318c03d
        if test "x$MACOSX" != "xyes"; then
318c03d
! 	tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/include /usr/include/tcl$tclver"
318c03d
        else
318c03d
  		tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
318c03d
        fi
318c03d
+       TCL_INC=
318c03d
        for try in $tclinc; do
318c03d
  	if test -f "$try/tcl.h"; then
318c03d
  	  echo "$as_me:$LINENO: result: $try/tcl.h" >&5
318c03d
*** ../vim-7.1.256/src/configure.in	Wed Feb 13 10:27:28 2008
318c03d
--- src/configure.in	Wed Feb 13 11:23:55 2008
318c03d
***************
318c03d
*** 794,804 ****
318c03d
  
318c03d
        AC_MSG_CHECKING(for location of Tcl include)
318c03d
        if test "x$MACOSX" != "xyes"; then
318c03d
! 	tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/include"
318c03d
        else
318c03d
  	dnl For Mac OS X 10.3, use the OS-provided framework location
318c03d
  	tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
318c03d
        fi
318c03d
        for try in $tclinc; do
318c03d
  	if test -f "$try/tcl.h"; then
318c03d
  	  AC_MSG_RESULT($try/tcl.h)
318c03d
--- 794,805 ----
318c03d
  
318c03d
        AC_MSG_CHECKING(for location of Tcl include)
318c03d
        if test "x$MACOSX" != "xyes"; then
318c03d
! 	tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
318c03d
        else
318c03d
  	dnl For Mac OS X 10.3, use the OS-provided framework location
318c03d
  	tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
318c03d
        fi
318c03d
+       TCL_INC=
318c03d
        for try in $tclinc; do
318c03d
  	if test -f "$try/tcl.h"; then
318c03d
  	  AC_MSG_RESULT($try/tcl.h)
318c03d
*** ../vim-7.1.256/src/version.c	Wed Feb 20 12:22:59 2008
318c03d
--- src/version.c	Wed Feb 20 12:42:17 2008
318c03d
***************
318c03d
*** 668,669 ****
318c03d
--- 668,671 ----
318c03d
  {   /* Add new patch number below this line */
318c03d
+ /**/
318c03d
+     257,
318c03d
  /**/
318c03d
318c03d
-- 
318c03d
He who laughs last, thinks slowest.
318c03d
318c03d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
318c03d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
318c03d
\\\        download, build and distribute -- http://www.A-A-P.org        ///
318c03d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///