Index: kitsh/buildsrc/kitsh-0.0/Makefile.in
==================================================================
--- kitsh/buildsrc/kitsh-0.0/Makefile.in
+++ kitsh/buildsrc/kitsh-0.0/Makefile.in
@@ -1,7 +1,7 @@
 CC = @CC@
-CFLAGS = -Wall @CFLAGS@
+CFLAGS = @CFLAGS@ @DEFS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ARCHS = @ARCHS@
 OBJS = kitInit.o main.o pwb.o rechan.o zlib.o

Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4
==================================================================
--- kitsh/buildsrc/kitsh-0.0/aclocal.m4
+++ kitsh/buildsrc/kitsh-0.0/aclocal.m4
@@ -72,17 +72,14 @@
 		ARCHS="${ARCHS} ${libfiles}"
 
 		AC_MSG_RESULT([${libfiles}])
 
 		if test "${libfiles}" != ""; then
-			upperproj=`echo "${proj}" | dd conv=ucase 2>/dev/null`
-
-			AC_DEFINE(KIT_INCLUDES_$upperproj)
-
 			if test "${proj}" = "mk4tcl"; then
+				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
 				DC_DO_STATIC_LINK_LIBCXX
 			fi
 		fi
 	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
@@ -1,8 +1,7 @@
 dnl What are we running
 AC_INIT(kitsh, 0.0)
-AC_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

Index: kitsh/buildsrc/kitsh-0.0/kitInit.c
==================================================================
--- kitsh/buildsrc/kitsh-0.0/kitInit.c
+++ kitsh/buildsrc/kitsh-0.0/kitInit.c
@@ -35,11 +35,11 @@
 
 #ifdef KIT_INCLUDES_ITCL
 Tcl_AppInitProc	Itcl_Init;
 #endif
 #ifdef KIT_INCLUDES_MK4TCL
-Tcl_AppInitProc	Mk4tcl_Init
+Tcl_AppInitProc	Mk4tcl_Init;
 #endif
 Tcl_AppInitProc Vfs_Init, Rechan_Init, Zlib_Init;
 #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
 Tcl_AppInitProc	Pwb_Init;
 #endif
@@ -187,12 +187,12 @@
 #ifdef HAVE_TCLSETSTARTUPSCRIPTPATH
         path = TclGetStartupScriptPath();
 	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
 #else
 #  ifdef HAVE_TCL_SETSTARTUPSCRIPT
-        path = Tcl_GetStartupScriptPath(NULL);
-	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
+        path = Tcl_GetStartupScript(NULL);
+	Tcl_SetStartupScript(Tcl_GetObjResult(interp), NULL);
 #  endif
 #endif
 	if (path == NULL)
 	  Tcl_Eval(interp, "incr argc -1; set argv [lrange $argv 1 end]");
     }