Swig updates for javascript

git-svn-id: svn+ssh://svn.code.sf.net/p/cmusphinx/code/trunk/sphinxbase@13132 94700074-3cef-4d97-a70e-9c8c206c02f5

Author: nshmyrev

sphinxbase.pc.in

@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 libs="@LIBS@"
+datadir=@datarootdir@/@PACKAGE@
 
 Name: SphinxBase
 Description: Shared components for Sphinx speech recognition

swig/Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS = python
 
-swigdir = $(datadir)/@PACKAGE@/swig
+swigdir = $(pkgdatadir)/swig
 dist_swig_DATA = \
 	cmd_ln.i \
 	fe.i \

swig/iterators.i

@@ -64,7 +64,7 @@ typedef struct {
 
 %extend TYPE##Iterator {
   TYPE##Iterator(PREFIX##_t *ptr) {
-    TYPE##Iterator *iter = ckd_malloc(sizeof *iter);
+    TYPE##Iterator *iter = (TYPE##Iterator *)ckd_malloc(sizeof *iter);
     iter->ptr = ptr;
     return iter;
   }

swig/sphinxbase.i

@@ -69,17 +69,14 @@ negative error code."
 #endif
 
 %begin %{
+#include <stdbool.h>
 #include <sphinxbase/cmd_ln.h>
 #include <sphinxbase/err.h>
 #include <sphinxbase/fe.h>
 #include <sphinxbase/feat.h>
 #include <sphinxbase/jsgf.h>
 #include <sphinxbase/ngram_model.h>
 
-typedef int bool;
-#define false 0
-#define true 1
-
 typedef cmd_ln_t Config;
 typedef jsgf_t Jsgf;
 typedef jsgf_rule_t JsgfRule;