Check-in [1f75d05931]
Bounty program for improvements to Tcl and certain Tcl packages.
Overview
Comment:Updated to check for "xxd"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tls-1-7
Files: files | file ages | folders
SHA1: 1f75d05931a24be224ea197ce808bbeaca94d0c8
User & Date: rkeene on 2016-12-02 21:25:43
Other Links: branch diff | manifest | tags
Context
2016-12-02
21:29
Updated to fail if we are unable to get OpenSSL configuration check-in: d5323765c7 user: rkeene tags: tls-1-7
21:25
Updated to check for "xxd" check-in: 1f75d05931 user: rkeene tags: tls-1-7
21:25
Fixed typo check-in: abe0565ce2 user: rkeene tags: tls-1-7
Changes

Modified Makefile.in from [8756dc63ab] to [8a7210cabb].

28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
tlsIO.o: @[email protected]/tlsIO.c @[email protected]/tlsInt.h
tlsX509.o: @[email protected]/tlsX509.c @[email protected]/tlsInt.h

# Create a C-source-ified version of the script resources
# for TclTLS so that we only need a single file to enable
# this extension
@[email protected]/tls.tcl.h: @[email protected]/tls.tcl
	xxd -i < '@[email protected]/tls.tcl' > '@[email protected]/tls.tcl.h.new'
	mv '@[email protected]/tls.tcl.h.new' '@[email protected]/tls.tcl.h'

# Create default DH parameters
dh_params.h: @[email protected]/gen_dh_params
	@[email protected]/gen_dh_params @[email protected] > dh_params.h.new
	mv dh_params.h.new dh_params.h







|







28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
tlsIO.o: @srcdi[email protected]/tlsIO.c @[email protected]/tlsInt.h
tlsX509.o: @[email protected]/tlsX509.c @[email protected]/tlsInt.h

# Create a C-source-ified version of the script resources
# for TclTLS so that we only need a single file to enable
# this extension
@[email protected]/tls.tcl.h: @[email protected]/tls.tcl
	@[email protected] -i < '@[email protected]/tls.tcl' > '@[email protected]/tls.tcl.h.new'
	mv '@[email protected]/tls.tcl.h.new' '@[email protected]/tls.tcl.h'

# Create default DH parameters
dh_params.h: @[email protected]/gen_dh_params
	@[email protected]/gen_dh_params @[email protected] > dh_params.h.new
	mv dh_params.h.new dh_params.h

Modified configure.in from [079aa2a221] to [7988cde745].

65
66
67
68
69
70
71




72
73
74
75
76
77
78
		tcltls_debug='true'
	fi
])
if test "$tcltls_debug" = 'true'; then
	AC_DEFINE(TCLEXT_TCLTLS_DEBUG, [1], [Enable debugging build])
fi





AC_CHECK_TOOL([PKGCONFIG], [pkg-config], [false])

dnl XXX:TODO: Automatically determine the SSL library to use
dnl           defaulting to OpenSSL for compatibility reasons
if test "$tcltls_ssl_lib" = 'auto'; then
	tcltls_ssl_lib='openssl'
fi






>
>
>
>







65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
		tcltls_debug='true'
	fi
])
if test "$tcltls_debug" = 'true'; then
	AC_DEFINE(TCLEXT_TCLTLS_DEBUG, [1], [Enable debugging build])
fi

dnl Find "xxd" so we can build the tls.tcl.h file
AC_CHECK_TOOL([XXD], [xxd], [__xxd__not__found])

dnl Find "pkg-config" since we need to use it
AC_CHECK_TOOL([PKGCONFIG], [pkg-config], [false])

dnl XXX:TODO: Automatically determine the SSL library to use
dnl           defaulting to OpenSSL for compatibility reasons
if test "$tcltls_ssl_lib" = 'auto'; then
	tcltls_ssl_lib='openssl'
fi