[patch] new version of plplot-5.9.10-tcltk.patch

plplot-5.9.10-tcltk.patch (text/plain), 3.48 KB, created by Helmut Jarausch on 2013-11-06 10:53:11 UTC

--- cmake/modules/tcl-related.cmake.ORIG	2013-05-02 12:25:42.000000000 +0200
+++ cmake/modules/tcl-related.cmake	2013-11-06 11:34:29.299329457 +0100
@@ -85,16 +85,16 @@
 	OUTPUT_VARIABLE AVAILABLE_ITCL)
       if(AVAILABLE_ITCL)
         execute_process(
-	COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
-	OUTPUT_VARIABLE itcl_library_versions)
+	  COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
+	  OUTPUT_VARIABLE itcl_library_versions)
         message(STATUS "Looking for itcl.h")
         find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH})
         if(ITCL_INCLUDE_PATH)
           message(STATUS "Looking for itcl.h - found")
           message(STATUS "Looking for itcl library")
-	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
-          set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+          get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
+          set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
           foreach(version ${itcl_library_versions})
             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
               PATH_SUFFIXES itcl${version})
@@ -132,13 +132,21 @@
     else(ENABLE_itcl)
       set(MKTCLINDEX_ARGS "-tcl")
     endif(ENABLE_itcl)
+
     if(ENABLE_tk AND NOT X11_FOUND)
       message(STATUS "WARNING: X11 not found, disabling Tk interface code")
       set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE)
     endif(ENABLE_tk AND NOT X11_FOUND)
     if(ENABLE_tk)
+      get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
+      if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
+       message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}")
+       message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}")
+       message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible")
+      endif(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
+    endif(ENABLE_tk)
+    if(ENABLE_tk)
       set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
-      set(TK_LIBRARY ${TK_LIBRARY})
       message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}")
       message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
     else(ENABLE_tk)
@@ -153,9 +161,9 @@
       if(ITK_INCLUDE_PATH)
         message(STATUS "Looking for itk.h - found")
         message(STATUS "Looking for itk library")
-        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+        set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
         foreach(version ${itk_library_versions})
-          find_library(ITK_LIBRARY itk${version}
+          find_library(ITK_LIBRARY itk${version} PATHS ${TCL_LIBRARY_PATH}
             PATH_SUFFIXES itk${version})
         endforeach(version ${itk_library_versions})
         if(ITK_LIBRARY)
--- bindings/tk/tkMain.c.ORIG	2013-01-30 00:36:01.000000000 +0100
+++ bindings/tk/tkMain.c	2013-11-06 11:36:47.394316824 +0100
@@ -1,4 +1,4 @@
-// $Id: tkMain.c 12286 2013-01-29 23:36:01Z airwin $
+// $Id: plplot-5.9.10-tcltk.patch,v 1.1 2013/11/05 23:56:14 bicatali Exp $
 //
 // Modified version of tkMain.c, from Tk 3.6.
 // Maurice LeBrun
@@ -85,7 +85,8 @@
 
 // From tclIntDecls.h
 
-#ifndef Tcl_Import_TCL_DECLARED
+//#ifndef Tcl_Import_TCL_DECLARED
+#if 0
 EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
                                      Tcl_Namespace * nsPtr, char * pattern,
                                      int allowOverwrite ) );