TclTLS
Check-in [e37183415a]
Login
HomeTimelineDownloadBrowse SourceBranchesTagsTicketsWiki
Overview
Comment:Updated to support the --with-ssl-dir configure option
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tls-1-7
Files: files | file ages | folders
SHA1: e37183415a28c74c5ab85de460aed3815070c384
User & Date: rkeene on 2016-12-06 16:15:18
Other Links: branch diff | manifest | tags
Context
2016-12-06
16:18
Indicated in help that an argument is required for --with-ssl check-in: 8fcef79719 user: rkeene tags: tls-1-7
16:15
Updated to support the --with-ssl-dir configure option check-in: e37183415a user: rkeene tags: tls-1-7
15:36
Added support for specifying a path to OpenSSL/LibreSSL check-in: 1af85e464a user: rkeene tags: tls-1-7
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified aclocal/tcltls_openssl.m4 from [a679608cfd] to [7142f8c416]. 

1









2
3
4
5
6





7
8
9
10
11
12
13
14








15
16

17
18
19
20
21
22
23

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








21
22
23
24
25
26
27
28


29
30
31
32
33
34
35
36


+
+
+
+
+
+
+
+
+





+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+








AC_DEFUN([TCLTLS_SSL_OPENSSL], [
	openssldir=''
	AC_ARG_WITH([ssl-dir],
		AS_HELP_STRING(
			[--with-ssl-dir=<dir>],
			[deprecated, use --with-openssl-dir -- currently has the same meaning]
		), [
			openssldir="$withval"
		]
	)
	AC_ARG_WITH([openssl-dir],
		AS_HELP_STRING(
			[--with-openssl-dir=<dir>],
			[path to root directory of OpenSSL or LibreSSL installation]
		), [
			openssldir="$withval"
		]
	)

	if test -n "$openssldir"; then
			if test -e "$withval/libssl.$SHOBJEXT"; then
				TCLTLS_SSL_LIBS="-L$withval -lssl -lcrypto"
				withval="`AS_DIRNAME(["$withval"])`"
			else
				TCLTLS_SSL_LIBS="-L$withval/lib -lssl -lcrypto"
			fi
			TCLTLS_SSL_CFLAGS="-I$withval/include"
			TCLTLS_SSL_CPPFLAGS="-I$withval/include"
		if test -e "$openssldir/libssl.$SHOBJEXT"; then
			TCLTLS_SSL_LIBS="-L$openssldir -lssl -lcrypto"
			openssldir="`AS_DIRNAME(["$openssldir"])`"
		else
			TCLTLS_SSL_LIBS="-L$openssldir/lib -lssl -lcrypto"
		fi
		TCLTLS_SSL_CFLAGS="-I$openssldir/include"
		TCLTLS_SSL_CPPFLAGS="-I$openssldir/include"
		]
	)
	fi

	dnl Use pkg-config to find the libraries
	AC_ARG_VAR([TCLTLS_SSL_LIBS], [libraries to pass to the linker for OpenSSL or LibreSSL])
	AC_ARG_VAR([TCLTLS_SSL_CFLAGS], [C compiler flags for OpenSSL or LibreSSL])
	AC_ARG_VAR([TCLTLS_SSL_CPPFLAGS], [C preprocessor flags for OpenSSL or LibreSSL])
	if test -z "$TCLTLS_SSL_LIBS"; then
		TCLTLS_SSL_LIBS="`"${PKGCONFIG}" openssl --libs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration])
︙

Powered by Fossil · RSS