diff --git a/ChangeLog b/ChangeLog index f3279d07f..b28df5d21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-30 + * configure.in: --with-tcl search path make broader to limit the need of the + optional argument. Message in case of tclConfig.sh file not found + fixed by sed. + * examples/tclspice/*/*.tcl: fixed load libspice lines due to the + directories hierarchy. (One level more) + 2008-11-29 Holger Vogt * frontend/numparam/xpressn.c: rand() and gauss() moved to math/misc/randnumb.c diff --git a/configure.in b/configure.in index babf28918..71876619b 100644 --- a/configure.in +++ b/configure.in @@ -317,16 +317,25 @@ if test "x$with_tcl" != "x" -a "$with_tcl" != "no" ; then if test "x$tcl_config_sh" = "x" ; then for dir in \ + `ls -dr /usr/local/tcltk/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ `ls -dr /usr/local/tcl/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/local/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/share/tcltk/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/share/tcl/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/share/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/lib/tcl/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/lib/tcl[[7-9]].[[0-9]]* 2>/dev/null` \ /usr/local/tcl \ /usr/local \ /usr \ /mingw do if test -r "$dir/tclConfig.sh" ; then + echo "Automatic research of tclConfig.sh Found one, accepting it and stopping research." tcl_config_sh="$dir/tclConfig.sh" break elif test -r "$dir/lib/tclConfig.sh" ; then + echo "Automatic research of tclConfig.sh Found one, accepting it and stopping research." tcl_config_sh="$dir/lib/tclConfig.sh" break fi @@ -340,7 +349,7 @@ AC_MSG_RESULT([${tcl_config_sh}]) if test "x$tcl_config_sh" = "x" ; then echo "can't find Tcl configuration script \"tclConfig.sh\"" - find /usr/lib/ -name 'tclConfig.sh' -exec echo "Should you add --with-tcl={} to ./configure arguments?" \; + find /usr/ -name 'tclConfig.sh' -exec echo "Should you add --with-tcl={} to ./configure arguments?" \; | sed -re "s/\/tclConfig.sh/ /" exit 1 fi diff --git a/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl b/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl index 54b441993..55a0c2b7d 100644 --- a/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl +++ b/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl @@ -5,7 +5,7 @@ # old name: analyse-20070504-0.tcl package require BLT -load ../../src/.libs/libspice.so +load ../../../src/.libs/libspice.so # Test of virtual capacitore circuit # Vary the control voltage and log the resulting capacitance diff --git a/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl b/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl index 394b46fe0..fb0a5d170 100644 --- a/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl +++ b/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl @@ -4,7 +4,7 @@ ### package require BLT -load ../../src/.libs/libspice.so +load ../../../src/.libs/libspice.so namespace import blt::* wm title . "Vector Test script" diff --git a/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl b/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl index 8ade99d79..0b0458566 100644 --- a/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl +++ b/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl @@ -4,7 +4,7 @@ ### package require BLT -load ../../src/.libs/libspice.so +load ../../../src/.libs/libspice.so source differentiate.tcl spice::codemodel ../../src/xspice/icm/spice2poly/spice2poly.cm proc temperatures_calc {temp_inf temp_sup points} { diff --git a/examples/tclspice/tcl-testbench4/vspicechart.tcl b/examples/tclspice/tcl-testbench4/vspicechart.tcl index 74660321d..810c2e74e 100644 --- a/examples/tclspice/tcl-testbench4/vspicechart.tcl +++ b/examples/tclspice/tcl-testbench4/vspicechart.tcl @@ -7,7 +7,7 @@ package require BLT -load "../../src/.libs/libspice.so" +load "../../../src/.libs/libspice.so" source selectfromlist.tcl source bltGraph.tcl diff --git a/examples/tclspice/tcl/test_vectoblt.tcl b/examples/tclspice/tcl/test_vectoblt.tcl index 9ef7a06ed..052410ae1 100644 --- a/examples/tclspice/tcl/test_vectoblt.tcl +++ b/examples/tclspice/tcl/test_vectoblt.tcl @@ -4,7 +4,7 @@ ### package require BLT -load ../../src/.libs/libspice.so +load ../../../src/.libs/libspice.so spice::source "diffpair.cir" spice::op diff --git a/src/tclspice.c b/src/tclspice.c index de0849d9d..c9429aa06 100755 --- a/src/tclspice.c +++ b/src/tclspice.c @@ -17,7 +17,7 @@ #define TCLSPICE_prefix "spice::" #define TCLSPICE_namespace "spice" #ifdef _MSC_VER -#define TCLSPICE_version "17.1" +#define TCLSPICE_version "18.0" #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2