It can now find the yajl includes. It doesn't compile yet.

flightaware · Mar 23, 2010 · db253c2 · db253c2
1 parent 0f4d339
commit db253c2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 autom4te.cache
 configure
+config.log
+config.status
 Makefile
 pkgIndex.tcl
 *.o

diff --git a/Makefile.in b/Makefile.in
@@ -144,7 +144,10 @@ TCLSH   	= $(TCLSH_ENV) $(TCLSH_PROG)
 
 SHARED_BUILD	= @SHARED_BUILD@
 
-INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
+# NB FIX the configure script to do this the right way
+YAJLINCLUDES=-I"/usr/local/include"
+
+INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ $(YAJLINCLUDES)
 #INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
 
 PKG_CFLAGS	= @PKG_CFLAGS@

diff --git a/generic/yajltcl.c b/generic/yajltcl.c
@@ -3,6 +3,7 @@
  */
 
 #include <tcl.h>
+#include "yajltcl.h"
 
 
 /*
@@ -20,7 +21,7 @@
  */
 
 
-^L
+
 /*
  *----------------------------------------------------------------------
  *

diff --git a/generic/yajltcl.h b/generic/yajltcl.h
@@ -8,10 +8,15 @@
  * for details.
  */
 
+
+/* NB - fix the configure script */
+#include <yajl/yajl_common.h>
+#include <yajl/yajl_gen.h>
+
 extern int
 yajltcl_yajlObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objvp[]);
 
 typedef struct yajltcl_clientData
 {
     yajl_gen handle;
-}
+};