New upstream version 3.4.13+dfsg.upstream/3.4.13+dfsgupstream

1 files changed, 16 insertions, 3 deletions

diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro
index 80a11fe..de6990c 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl.pro
+++ b/Plugins/ScriptingTcl/ScriptingTcl.pro
@@ -91,31 +91,44 @@ macx: {
     message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)")
 
     # Find tclConfig.sh
-    TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,runtime]" | tclsh)/tclConfig.sh
+    !exists($$TCL_CONFIG) {
+		TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,runtime]" | tclsh)/tclConfig.sh
+		!exists($$TCL_CONFIG) {
+			TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,install]" | tclsh)/tclConfig.sh
+			message("Looking for $$TCL_CONFIG")
+		}
+		!exists($$TCL_CONFIG) {
+			error("Could not find tclConfig.sh file. You can define its absolute path by qmake parameter: TCL_CONFIG=/path/to/tclConfig.sh")
+		}
+	}
+    message("Using tclConfig: $$TCL_CONFIG")
 
     # Define other libs required when linking with Tcl
     eval($$system(cat $$TCL_CONFIG | grep TCL_LIBS))
     eval(LIBS += $$TCL_LIBS)
+    message("TCL_LIBS: $$TCL_LIBS")
 
     # Define headers dir
     eval($$system(cat $$TCL_CONFIG | grep TCL_INCLUDE_SPEC))
     INCLUDEPATH += $$replace(TCL_INCLUDE_SPEC, -I/, /)
     DEPENDPATH += $$replace(TCL_INCLUDE_SPEC, -I/, /)
+    message("TCL_INCLUDE_SPEC: $$TCL_INCLUDE_SPEC")
 
     # Find static library
     eval($$system(cat $$TCL_CONFIG | grep TCL_STUB_LIB_PATH))
     STATIC_LIB = $$replace(TCL_STUB_LIB_PATH, tclstub, tcl)
+    message("TCL_STUB_LIB_PATH: $$TCL_STUB_LIB_PATH")
 
     # If found static lib, we link statically
     exists($$STATIC_LIB) {
-        #message("Static linking of libtcl: $$STATIC_LIB")
+        message("Static linking of libtcl: $$STATIC_LIB")
         LIBS += $$STATIC_LIB
     }
 
     # If not found, use dynamic linking flags
     !exists($$STATIC_LIB) {
         eval($$system(cat $$TCL_CONFIG | grep TCL_LIB_SPEC))
-        #message("Dynamic linking of libtcl: $$TCL_LIB_SPEC")
+        message("Dynamic linking of libtcl: $$TCL_LIB_SPEC")
         eval(LIBS += $$TCL_LIB_SPEC)
     }
 }