Index: common/common.sh
==================================================================
--- common/common.sh
+++ common/common.sh
@@ -147,11 +147,11 @@
 }
 
 function configure() {
 	local tryopts tryopt
 	local staticpkg staticpkgvar
-	local isshared
+	local isshared disable_stubs
 	local save_cflags
 	local base_var kc_var
 	local configure_opt configure_opts configure_opts_new
 	local ignore_opt ignore_this_opt
 
@@ -212,23 +212,29 @@
 			pkg_configure_shared_build='0'
 		else
 			pkg_configure_shared_build='1'
 		fi
 
+		disable_stubs='0'
 		if [ "${isshared}" = '0' ]; then
-			tryopt="${tryopt} --disable-stubs --enable-static"
+			tryopt="${tryopt} --enable-static"
+			disable_stubs='1'
 		fi
 
 		if ! grep '[-]-disable-stubs' configure >/dev/null 2>/dev/null; then
-			if [ "${isshared}" = '0' ]; then
+			if [ "${disable_stubs}" = '1' ]; then
 				sed 's@USE_TCL_STUBS@XXX_TCL_STUBS@g' configure > configure.new
 			else
 				sed 's@XXX_TCL_STUBS@USE_TCL_STUBS@g' configure > configure.new
 			fi
 
 			cat configure.new > configure
 			rm -f configure.new
+		else
+			if [ "${disable_stubs}" = '1' ]; then
+				tryopt="${tryopt} --disable-stubs"
+			fi
 		fi
 
 		configure_opts=($tryopt --prefix="${installdir}" --exec-prefix="${installdir}" --libdir="${installdir}/lib" --with-tcl="${TCLCONFIGDIR}" "${configure_extra[@]}" ${CONFIGUREEXTRA})
 		configure_opts_new=()
 		for configure_opt in "${configure_opts[@]}"; do