ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.9 -j1.10...

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.9 -j1.10 CMake/vtkTclTkMacros.cmake)

CMake/vtkTclTkMacros.cmake

@@ -15,11 +15,16 @@ MACRO (VTK_GET_TCL_TK_VERSION tcl_tk_major_version tcl_tk_minor_version)
 
   SET (${tcl_tk_major_version} "")
   SET (${tcl_tk_minor_version} "")
+  IF (TK_INTERNAL_PATH)
+    SET (try_tk_internal_path ${TK_INTERNAL_PATH})
+  ELSE (TK_INTERNAL_PATH)
+    SET (try_tk_internal_path ${VTK_TK_INTERNAL_DIR})
+  ENDIF (TK_INTERNAL_PATH)
   FOREACH (tcl_tk_minor_version_try "2" "3" "4")
-    IF ("${TK_INTERNAL_PATH}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
+    IF ("${try_tk_internal_path}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
       SET (${tcl_tk_major_version} "8")
       SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
-    ENDIF ("${TK_INTERNAL_PATH}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
+    ENDIF ("${try_tk_internal_path}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
     IF ("${TCL_LIBRARY}" MATCHES "tcl8\\.?${tcl_tk_minor_version_try}")
       SET (${tcl_tk_major_version} "8")
       SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})