TclPKCS11

Check-in [515139af76]
Login

Check-in [515139af76]

Overview
Comment:Fixed issue with defining stubs mechanism incorrectly Updated to find shared object build flags Updated ignores Updated to cleanup after Win32 builds correctly
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 515139af76c408e99494a4b159a0a020cc0c6df8422340a302e080556372cfb3
User & Date: rkeene on 2010-10-10 17:38:09.000
Other Links: manifest | tags
Context
2010-10-10
17:56
Updated to not call Tcl_ObjPrintf() since this is not in Tcl 8.4 check-in: 774b9d1bc0 user: rkeene tags: trunk
17:38
Fixed issue with defining stubs mechanism incorrectly Updated to find shared object build flags Updated ignores Updated to cleanup after Win32 builds correctly check-in: 515139af76 user: rkeene tags: trunk
17:27
Fixed issue with shared object extension check-in: a1f2a83c52 user: rkeene tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Modified .fossil-settings/ignore-glob from [632b888f3c] to [de19415564]. 
1
2
3
4
5
6
7
8
9
10
11
12





Makefile
Makefile/*
aclocal.m4
aclocal.m4/*
autom4te.cache
autom4te.cache/*
config.log
config.log/*
config.status
config.status/*
configure
configure/*

















>
>
>
>

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

Makefile
Makefile/*
aclocal.m4
aclocal.m4/*
autom4te.cache
autom4te.cache/*
config.log
config.log/*
config.status
config.status/*
configure
configure/*
tclpkcs11.dll.a
tclpkcs11.dll.a/*
tclpkcs11.dll.def
tclpkcs11.dll.def/*
Modified Makefile.in from [118ecb7c7f] to [f7847be45f].
︙︙
10
11
12
13
14
15
16

17
18
19
20
21
22
23

pkcs11.h: pkcs11f.h pkcs11t.h
tclpkcs11.o: tclpkcs11.c pkcs11.h
tclpkcs11.@SHOBJEXT@: tclpkcs11.o
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o tclpkcs11.@SHOBJEXT@ tclpkcs11.o $(LIBS)

clean:
	rm -f tclpkcs11.@SHOBJEXT@ tclpkcs11.o


distclean: clean
	rm -rf autom4te.cache
	rm -f config.log config.status
	rm -f Makefile

.PHONY: all clean distclean








>








10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

pkcs11.h: pkcs11f.h pkcs11t.h
tclpkcs11.o: tclpkcs11.c pkcs11.h
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

.PHONY: all clean distclean
Modified aclocal/tcl.m4 from [96070f76c3] to [cce972d442].
︙︙
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

	TCLEXT_FIND_TCLCONFIG
	TCLEXT_LOAD_TCLCONFIG


	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])

		LIBS="${LIBS} ${TCL_STUB_LIB_SPEC}"
	else
		LIBS="${LIBS} ${TCL_LIB_SPEC}"
	fi

	CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC}"








|








49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

	TCLEXT_FIND_TCLCONFIG
	TCLEXT_LOAD_TCLCONFIG


	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([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

	CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC}"
︙︙
Modified configure.ac from [56a86ea8f9] to [6386d49ecc].
︙︙
8
9
10
11
12
13
14



15
16
17
18
19
20
21

AC_GNU_SOURCE

dnl Determine system information
DC_CHK_OS_INFO

dnl Perform Tcl Extension required stuff
TCLEXT_INIT




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)
])
AC_CHECK_FUNCS(dlopen shl_load)









>
>
>








8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

AC_GNU_SOURCE

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)
])
AC_CHECK_FUNCS(dlopen shl_load)
︙︙
Modified tclpkcs11.c from [1f96f707c2] to [621c9705a3].
︙︙
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511

 */
int Tclpkcs11_Init(Tcl_Interp *interp) {
	struct tclpkcs11_interpdata *interpdata;
	Tcl_Command tclCreatComm_ret;
	const char *tclPkgReq_ret;
	int tclPkgProv_ret;

#ifdef TCL_USE_STUBS
	const char *tclInitStubs_ret;

	/* Initialize Stubs */
	tclInitStubs_ret = Tcl_InitStubs(interp, "8.4", 0);
	if (!tclInitStubs_ret) {
		return(TCL_ERROR);
	}








|








1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511

 */
int Tclpkcs11_Init(Tcl_Interp *interp) {
	struct tclpkcs11_interpdata *interpdata;
	Tcl_Command tclCreatComm_ret;
	const char *tclPkgReq_ret;
	int tclPkgProv_ret;

#ifdef USE_TCL_STUBS
	const char *tclInitStubs_ret;

	/* Initialize Stubs */
	tclInitStubs_ret = Tcl_InitStubs(interp, "8.4", 0);
	if (!tclInitStubs_ret) {
		return(TCL_ERROR);
	}
︙︙