Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4
==================================================================
--- kitsh/buildsrc/kitsh-0.0/aclocal.m4
+++ kitsh/buildsrc/kitsh-0.0/aclocal.m4
@@ -158,11 +158,11 @@
 	DC_SETUP_TCL_PLAT_DEFS
 
 	dnl We will need this for the Tcl project, which we will always have
 	DC_CHECK_FOR_WHOLE_ARCHIVE
 
-	for proj in mk4tcl tcl tclvfs tk; do
+	for proj in mk4tcl tcl tclvfs tk zlib; do
 		AC_MSG_CHECKING([for libraries required for ${proj}])
 
 		projlibdir="../../../${proj}/inst"
 		projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`"
 		projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`"
@@ -203,20 +203,33 @@
 
 				if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then
 					AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)])
 					CFLAGS="${CFLAGS} -mwindows"
 				fi
+
+				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
+					projlibfiles="${projlibfilesnostub}"
+				], [
+					DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
+						projlibfiles="${projlibfiles}"
+					])
+				])
 
 				hide_symbols="0"
 			fi
 		fi
 
-		ARCHS="${ARCHS} ${projlibfiles}"
-
 		if test "${hide_symbols}" = "1"; then
 			STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
 		fi
+
+		dnl Do not explicitly link to Zlib, that will happen elsewhere
+		if test "${proj}" = "zlib"; then
+			continue
+		fi
+
+		ARCHS="${ARCHS} ${projlibfiles}"
 	done
 
 	AC_SUBST(ARCHS)
 	AC_SUBST(STRIPLIBS)
 ])

Index: kitsh/buildsrc/kitsh-0.0/configure.ac
==================================================================
--- kitsh/buildsrc/kitsh-0.0/configure.ac
+++ kitsh/buildsrc/kitsh-0.0/configure.ac
@@ -37,11 +37,11 @@
 
 	dnl Figure out how to statically link to libgcc, if needed
 	DC_STATIC_LIBGCC
 
 	dnl Specify local Appinit function
-	AC_DEFINE(DTK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function])
+	AC_DEFINE(TK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function])
 ], [
 	dnl We have KitDLL
 
 	dnl Determine system information
 	DC_CHK_OS_INFO