Index: kitsh/buildsrc/kitsh-0.0/Makefile.in
==================================================================
--- kitsh/buildsrc/kitsh-0.0/Makefile.in
+++ kitsh/buildsrc/kitsh-0.0/Makefile.in
@@ -1,12 +1,12 @@
 CC = @CC@
 CFLAGS = -Wall @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
+ARCHS = @ARCHS@
 OBJS = kitInit.o main.o pwb.o rechan.o zlib.o
-ARCHS = ../../../mk4tcl/inst/lib/Mk4tcl/Mk4tcl.a ../../../tcl/inst/lib/libtcl8.4.a ../../../tclvfs/inst/lib/vfs1.3/libvfs1.3.a
 
 all: kit
 
 kit: $(OBJS) $(ARCHS)
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS)

Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4
==================================================================
--- kitsh/buildsrc/kitsh-0.0/aclocal.m4
+++ kitsh/buildsrc/kitsh-0.0/aclocal.m4
@@ -24,12 +24,12 @@
 	fi
 
 	if test -f "${tclconfigsh}"; then
 		source "${tclconfigsh}"
 
-		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
-		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
+		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
+		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
 		LDFLAGS="${LDFLAGS}"
 		LIBS="${LIBS} ${TCL_LIBS}"
 	fi
 
 	AC_SUBST(CFLAGS)
@@ -48,5 +48,20 @@
 
 	AC_SUBST(LIBS)
 
 	AC_MSG_RESULT([${STATICLIBCXX}])
 ])
+
+AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
+	for proj in mk4tcl tcl tclvfs; do
+		AC_MSG_CHECKING([for libraries required for ${proj}])
+
+		libdir="../../../${proj}/inst"
+		libfiles="`find "${libdir}" -name '*.a' | tr "\n" ' '`"
+
+		ARCHS="${ARCHS} ${libfiles}"
+
+		AC_MSG_RESULT([${libfiles}])
+	done
+
+	AC_SUBST(ARCHS)
+])

Index: kitsh/buildsrc/kitsh-0.0/configure.ac
==================================================================
--- kitsh/buildsrc/kitsh-0.0/configure.ac
+++ kitsh/buildsrc/kitsh-0.0/configure.ac
@@ -12,13 +12,16 @@
 dnl Find the appropriate Tcl headers and libraries
 DC_DO_TCL
 
 dnl Find out how to statically link to libstdc++ (for Metakit)
 DC_DO_STATIC_LINK_LIBCXX
+
+dnl Find archives we need to link to
+DC_FIND_TCLKIT_LIBS
 
 dnl Find the appropriate libraries to link to
 AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
 AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
 AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
 
 dnl Produce output
 AC_OUTPUT(Makefile)