Small bugfixes concerning tcl8.6

thanks to Christian Simon for this!

diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c
index a1b52c8cfede01a94c41efd46708975d3cdb11be..71efd95a7f4eab0d719f306d06a0928d5b68a419 100644 (file)
--- a/allParam/tcl/tclParam.c
+++ b/allParam/tcl/tclParam.c
@@ -23,6 +23,9 @@ static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuild
 
 #include "../include/allParam.h"
 
+/* required for tcl>v8.6 thanks to Christian Simon for this hint:*/
+#define USE_INTERP_RESULT
+
 /* Allow for registration of a user routine for output of error
  * messages and provide a default one
  * BUGBUG static variables will eventually break in multithreaded

diff --git a/hadaq/configure.in b/hadaq/configure.in
index 15688779490d203c224ce39bdd7ad4f47af41b4b..fe4be8e7410956e6743659785816ec29fb5951e3 100644 (file)
--- a/hadaq/configure.in
+++ b/hadaq/configure.in
@@ -68,7 +68,7 @@ elif test "x$epics_version" = "x3_14"
 then
        LDFLAGS="-L$with_epics/lib/$EPICS_HOST_ARCH $LDFLAGS"
 fi
-AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl  tcl8.5 tcl8.4  tcl8.3 tcl8.2 tcl8.0 tcl7.4])
+AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl  tcl8.6 tcl8.5 tcl8.4  tcl8.3 tcl8.2 tcl8.0 tcl7.4])
 AC_SEARCH_LIBS(conParam, caParam, LIBS="-lcaParam -lca -lCom $LIBS",, -lca -lCom)
 elif test x$with_param = xfile
 then
@@ -81,7 +81,7 @@ AC_SEARCH_LIBS(sqlcxt, clntsh)
 AC_SEARCH_LIBS(conParam, oraParam)
 elif test x$with_param = xtcl
 then
-AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl tcl8.5 tcl8.4 tcl8.3 tcl8.2 tcl8.0 tcl7.4])
+AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl tcl8.6 tcl8.5 tcl8.4 tcl8.3 tcl8.2 tcl8.0 tcl7.4])
 AC_SEARCH_LIBS(conParam, tclParam)
 else
 AC_ERROR([Unknown parameter source $with_param])