Index: .fossil-settings/ignore-glob
==================================================================
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -8,5 +8,9 @@
 config.log/*
 config.status
 config.status/*
 configure
 configure/*
+tclpkcs11.dll.a
+tclpkcs11.dll.a/*
+tclpkcs11.dll.def
+tclpkcs11.dll.def/*

Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -12,10 +12,11 @@
 tclpkcs11.@SHOBJEXT@: tclpkcs11.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o tclpkcs11.@SHOBJEXT@ tclpkcs11.o $(LIBS)
 
 clean:
 	rm -f tclpkcs11.@SHOBJEXT@ tclpkcs11.o
+	rm -f tclpkcs11.@SHOBJEXT@.a tclpkcs11.@SHOBJEXT@.def
 
 distclean: clean
 	rm -rf autom4te.cache
 	rm -f config.log config.status
 	rm -f Makefile

Index: aclocal/tcl.m4
==================================================================
--- aclocal/tcl.m4
+++ aclocal/tcl.m4
@@ -51,11 +51,11 @@
 
 
 	AC_DEFINE_UNQUOTED([MODULE_SCOPE], [static], [Define how to declare a function should only be visible to the current module])
 
 	if test "$TCL_SUPPORTS_STUBS" = "1"; then
-		AC_DEFINE(TCL_USE_STUBS, [1], [Define if you are using the Tcl Stubs Mechanism])
+		AC_DEFINE([USE_TCL_STUBS], [1], [Define if you are using the Tcl Stubs Mechanism])
 
 		LIBS="${LIBS} ${TCL_STUB_LIB_SPEC}"
 	else
 		LIBS="${LIBS} ${TCL_LIB_SPEC}"
 	fi

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -10,10 +10,13 @@
 dnl Determine system information
 DC_CHK_OS_INFO
 
 dnl Perform Tcl Extension required stuff
 TCLEXT_INIT
+
+dnl Determine how to make shared objects
+DC_GET_SHOBJFLAGS
 
 dnl Find out if we have the functions needed to open shared objects
 AC_SEARCH_LIBS(dlopen, dl,, [
 	AC_SEARCH_LIBS(shl_load, dld dl)
 ])

Index: tclpkcs11.c
==================================================================
--- tclpkcs11.c
+++ tclpkcs11.c
@@ -1499,11 +1499,11 @@
 	struct tclpkcs11_interpdata *interpdata;
 	Tcl_Command tclCreatComm_ret;
 	const char *tclPkgReq_ret;
 	int tclPkgProv_ret;
 
-#ifdef TCL_USE_STUBS
+#ifdef USE_TCL_STUBS
 	const char *tclInitStubs_ret;
 
 	/* Initialize Stubs */
 	tclInitStubs_ret = Tcl_InitStubs(interp, "8.4", 0);
 	if (!tclInitStubs_ret) {