Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -3,16 +3,23 @@
 TCLVERS="8.4.19"
 export TCLVERS
 
 mode="build"
 if [ "$1" = "clean" ]; then
+	shift
+
 	mode="clean"
 fi
 if [ "$1" = "distclean" ]; then
+	shift
+
 	mode="distclean"
 fi
 
+CONFIGUREEXTRA="$@"
+export CONFIGUREEXTRA
+
 failedpkgs=""
 buildfailed="0"
 for pkg in tcl tk itcl mk4tcl tclvfs kitsh; do
 	if [ "${mode}" = "distclean" ]; then
 		rm -rf "${pkg}/src"

Index: kitsh/build.sh
==================================================================
--- kitsh/build.sh
+++ kitsh/build.sh
@@ -26,11 +26,12 @@
 	cp -r 'buildsrc' 'build'
 	cd "${BUILDDIR}" || exit 1
 
 	# Compile all objects...
 	## TODO: XXX: Need to replace this with a configure script
-	${CC:-cc} ${CPPFLAGS} ${CFLAGS} -I${TCLCONFIGDIR} -I${TCLCONFIGDIR}/../generic -o kit *.c $(find "${OTHERPKGSDIR}" -name '*.a' | grep '/inst/') ${LDFLAGS} -lz -lm -ldl  -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+	${CC:-cc} ${CPPFLAGS} ${CFLAGS} -I${TCLCONFIGDIR} -I${TCLCONFIGDIR}/../generic -o kit *.c $(find "${OTHERPKGSDIR}" -name '*.a' | grep '/inst/') ${LDFLAGS} -lz -lm -ldl  -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic || \
+	${CC:-cc} ${CPPFLAGS} ${CFLAGS} -I${TCLCONFIGDIR} -I${TCLCONFIGDIR}/../generic -o kit *.c $(find "${OTHERPKGSDIR}" -name '*.a' | grep '/inst/') ${LDFLAGS} -lz -lm -ldl -lnsl -lsocket -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
 	strip kit >/dev/null 2>/dev/null
 
 	# Create VFS directory
 	mkdir "starpack.vfs"
 	mkdir "starpack.vfs/lib"

Index: mk4tcl/build.sh
==================================================================
--- mk4tcl/build.sh
+++ mk4tcl/build.sh
@@ -38,15 +38,10 @@
 
 	# Build static libraries for linking against Tclkit
 	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
 	"${MAKE:-make}" tcllibdir="${INSTDIR}/lib" || exit 1
 	"${MAKE:-make}" tcllibdir="${INSTDIR}/lib" install
-	"${MAKE:-make}" tcllibdir="${INSTDIR}/lib" distclean
 
-	# Build shared object version (only used for non-Kit loading)
-	./configure --enable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
-	"${MAKE:-make}" tcllibdir="${INSTDIR}/lib" || exit 1
-	"${MAKE:-make}" tcllibdir="${INSTDIR}/lib" install
-
+	exit 0
 ) || exit 1
 
 exit 0

Index: tclvfs/build.sh
==================================================================
--- tclvfs/build.sh
+++ tclvfs/build.sh
@@ -40,16 +40,13 @@
 	# Build static version
 	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
 	"${MAKE:-make}" || exit 1
 	"${MAKE:-make}" install
 
-	# Build shared version
-	./configure --enable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
-	"${MAKE:-make}" || exit 1
-	"${MAKE:-make}" install
-
 	mkdir "${OUTDIR}/lib" || exit 1
 	cp -r "${INSTDIR}/lib"/vfs*/ "${OUTDIR}/lib/"
 	rm -f "${OUTDIR}/lib"/vfs*/*.a "${OUTDIR}/lib"/vfs*/*.so
+
+	exit 0
 ) || exit 1
 
 exit 0