Ticket #26140: patch-tcl.diff

src/configure.in

@@ -1213 +1213 @@
       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 -`
 
       AC_MSG_CHECKING(for location of Tcl include)
-      if test "x$MACOSX" != "xyes"; then
-        tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
-      else
-        dnl For Mac OS X 10.3, use the OS-provided framework location
-        tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
-      fi
+      tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver"
       TCL_INC=
       for try in $tclinc; do
         if test -f "$try/tcl.h"; then
@@ -1233 +1233 @@
       fi
       if test -z "$SKIP_TCL"; then
         AC_MSG_CHECKING(for location of tclConfig.sh script)
-        if test "x$MACOSX" != "xyes"; then
-          tclcnf=`echo $tclinc | sed s/include/lib/g`
-          tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
-        else
-          dnl For Mac OS X 10.3, use the OS-provided framework location
-          tclcnf="/System/Library/Frameworks/Tcl.framework"
-        fi
+        tclcnf=`echo $tclinc | sed s/include/lib/g`
+        tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
         for try in $tclcnf; do
           if test -f $try/tclConfig.sh; then
             AC_MSG_RESULT($try/tclConfig.sh)