@@ -17,11 +17,11 @@
 		[yes|kitdll], [
 			TARGET="kitdll"
 		],
 		static, [
 			TARGET="kitdll-static"
-		]
+		],
 		no, [
 			true
 		], [
 			AC_MSG_RESULT([unknown])
 
@@ -36,15 +36,18 @@
 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)!]) ])
 
 AS_IF([test "$TARGET" = "tclkit"], [
 	dnl We have Tclkit
+	TARGET_BASE='tclkit'
 
 	dnl Specify local Appinit function
 	AC_DEFINE(TK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function])
+
 ], [
 	dnl We have KitDLL
+	TARGET_BASE='kitdll'
 
 	dnl Determine system information
 	DC_CHK_OS_INFO
 
 	dnl Determine how to create a shared object
@@ -56,12 +59,14 @@
 	dnl Define KitDLL usage
 	AC_DEFINE([TCLKIT_DLL], [1], [Define if you are using a KitDLL rather than a Tclkit])
 
 	dnl Define a static KitDLL
 	AS_IF([test "$TARGET" = "kitdll-static"], [
+		AC_CHECK_TOOL(RANLIB, [ranlib], [:])
+		AC_CHECK_TOOL(AR, [ar], [false MISSING AR])
+
 		AC_DEFINE([TCLKIT_DLL_STATIC], [1], [Define if you are building a static KitDLL])
-		SHOBJE
 	])
 ])
 
 dnl Figure out how to statically link to libgcc, if needed
 DC_STATIC_LIBGCC
@@ -209,9 +214,9 @@
 AC_SUBST(EXTRA_KIT_DEPS)
 AC_SUBST(LDFLAGS_ADD)
 
 dnl Put correct Makefile template in place
 rm -f Makefile.in
-cp Makefile.${TARGET}.in Makefile.in
+cp Makefile.${TARGET_BASE}.in Makefile.in
 
 dnl Produce output
 AC_OUTPUT(Makefile Makefile.common)