Fix autotools build

Author: cyanogilvie

Makefile.in

@@ -316,7 +316,7 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
 # As necessary, add $(srcdir):$(srcdir)/compat:....
 #========================================================================
 
-VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macosx
+VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/teabase:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macosx
 
 %.@OBJEXT@: %.c generic/rl_jsonDecls.h $(srcdir)/generic/rl_jsonInt.h $(srcdir)/generic/rl_json.h
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@

build_template/libtommath/Makefile

@@ -79,7 +79,7 @@ ENABLE_UNLOAD
 # and PKG_TCL_SOURCES.
 #-----------------------------------------------------------------------
 
-TEA_ADD_SOURCES([parser.c rl_json.c json_types.c dedup.c api.c rl_jsonStubInit.c names.c rl_jsonBuildInfo.c])
+TEA_ADD_SOURCES([parser.c rl_json.c json_types.c dedup.c api.c rl_jsonStubInit.c teabase/names.c rl_jsonBuildInfo.c])
 TEA_ADD_HEADERS([generic/rl_jsonDecls.h generic/rl_json.h])
 TEA_ADD_INCLUDES([-Igeneric -Iteabase])
 TEA_ADD_LIBS([-lm])

configure.ac

@@ -56,14 +56,17 @@ EXTERN int		JSON_SetJArrayObj(Tcl_Interp*interp, Tcl_Obj*obj,
 				Tcl_Size objc, Tcl_Obj*objv[]);
 /* 16 */
 EXTERN int		JSON_JArrayObjGetElements(Tcl_Interp*interp,
-				Tcl_Obj*arrayObj, Tcl_Size*objc, Tcl_Obj***objv);
+				Tcl_Obj*arrayObj, Tcl_Size*objc,
+				Tcl_Obj***objv);
 /* 17 */
 EXTERN int		JSON_JArrayObjIndex(Tcl_Interp*interp,
-				Tcl_Obj*arrayObj, Tcl_Size index, Tcl_Obj**elem);
+				Tcl_Obj*arrayObj, Tcl_Size index,
+				Tcl_Obj**elem);
 /* 18 */
 EXTERN int		JSON_JArrayObjReplace(Tcl_Interp*interp,
 				Tcl_Obj*arrayObj, Tcl_Size first,
-				Tcl_Size count, Tcl_Size objc, Tcl_Obj*objv[]);
+				Tcl_Size count, Tcl_Size objc,
+				Tcl_Obj*objv[]);
 /* 19 */
 EXTERN int		JSON_Get(Tcl_Interp*interp, Tcl_Obj*obj,
 				Tcl_Obj* path /* can be NULL */,
@@ -100,7 +103,8 @@ EXTERN int		JSON_Type(Tcl_Interp*interp, Tcl_Obj*obj,
 				enum json_types*type);
 /* 29 */
 EXTERN int		JSON_Length(Tcl_Interp*interp, Tcl_Obj*obj,
-				Tcl_Obj* path /* can be NULL */, Tcl_Size*length);
+				Tcl_Obj* path /* can be NULL */,
+				Tcl_Size*length);
 /* 30 */
 EXTERN int		JSON_Keys(Tcl_Interp*interp, Tcl_Obj*obj,
 				Tcl_Obj* path /* can be NULL */,