From 0b505ec15a43b4b8e4c2584d0c4f81ff3391f3de Mon Sep 17 00:00:00 2001
From: bustico
Date: Wed, 7 Jan 2015 14:01:47 +0000
Subject: * fix uninitialised variable in ivy-bind * start tcl interpreter
 early * add some pkg-config configuration file * use header file from tcl-dev
 (which need to be installed)

---
 src/Makefile      |  3 ++-
 src/ivy-c.pc.in   | 10 ++++++++++
 src/ivy-tcl.pc.in | 10 ++++++++++
 src/ivybind.c     |  4 ++--
 src/ivytcl.c      |  1 +
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 src/ivy-c.pc.in
 create mode 100644 src/ivy-tcl.pc.in

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 193ffc8..f9fbd11 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -54,7 +54,8 @@ ifndef TCLVERS
 TCLVERS:= $(shell perl -e '@_=sort map (m|/usr/lib64/libtcl(\d\.\d)\.so|, glob ("/usr/lib64/libtcl*")); print pop @_')
 endif
 ifndef TCLVERS
-TCLVERS=8.4
+#TCLVERS=8.4
+TCLVERS=
 endif
 
 TCLINCL = -I/usr/include/tcl$(TCLVERS)
diff --git a/src/ivy-c.pc.in b/src/ivy-c.pc.in
new file mode 100644
index 0000000..b4f90bd
--- /dev/null
+++ b/src/ivy-c.pc.in
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: ivy-c
+Description: A software bus
+Version: @MAJOR@.@MINOR@
+Libs: -L${libdir} -livy @PCREINC@ @EXTRALIB@
+Cflags: -I${includedir} @REGEXP@ @PCRELIB@
diff --git a/src/ivy-tcl.pc.in b/src/ivy-tcl.pc.in
new file mode 100644
index 0000000..86c9ef3
--- /dev/null
+++ b/src/ivy-tcl.pc.in
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: ivy-tcl
+Description: A software bus (TCL main loop)
+Version: @MAJOR@.@MINOR@
+Libs: -L${libdir} -ltclivy @PCREINC@ @EXTRALIB@
+Cflags: -I${includedir} @REGEXP@ @PCRELIB@
diff --git a/src/ivybind.c b/src/ivybind.c
index 27d5705..8f919b2 100644
--- a/src/ivybind.c
+++ b/src/ivybind.c
@@ -270,7 +270,7 @@ int IvyBindingFilter(const char *expression)
 	FiltredWordPtr word=0;
 	int err;
 	int regexp_ok = 1; /* accepte tout par default */
-	int tokenlen;
+	int tokenlen = 0;
 	const char *token;
 	
 	if ( *expression =='^' && messages_classes !=0 )
@@ -318,4 +318,4 @@ void IvyBindingTerminate()
   }
 	IVY_LIST_EMPTY( messages_classes );
 	messages_classes = 0;
-}
\ No newline at end of file
+}
diff --git a/src/ivytcl.c b/src/ivytcl.c
index ed23713..6806d49 100644
--- a/src/ivytcl.c
+++ b/src/ivytcl.c
@@ -64,6 +64,7 @@ void IvyChannelInit(void)
 #endif 
 	if ( channel_initialized ) return;
 
+  Tcl_FindExecutable(NULL);
 	/* pour eviter les plantages quand les autres applis font core-dump */
 #ifndef WIN32
 	signal( SIGPIPE, SIG_IGN);
-- 
cgit v1.1