TclTLS
Check-in [9b922b5bb3]
Login
HomeTimelineDownloadBrowse SourceBranchesTagsTicketsWiki
Overview
Comment:Merged in more acinclude.m4 changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | crypto
Files: files | file ages | folders
SHA3-256: 9b922b5bb35e08e4baad82fa2fbfdebedfcaa2552b0a253c8b8f12d111fe7bb2
User & Date: bohagan on 2024-03-05 02:10:49
Other Links: branch diff | manifest | tags
Context
2024-03-10
01:27
Windows makefile update to add realclean target and correct pkgIndex target check-in: ae7ba9d447 user: bohagan tags: crypto
2024-03-05
02:10
Merged in more acinclude.m4 changes check-in: 9b922b5bb3 user: bohagan tags: crypto
02:08
Corrected logic error in acinclude.m4 check for include files check-in: 273a40deb4 user: bohagan tags: trunk
2024-03-02
03:14
Merged in acinclude.m4 changes Regenerated configure file check-in: cf160c6f63 user: bohagan tags: crypto
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified acinclude.m4 from [410eaef946] to [087476b928].

︙
106
107
108
109
110
111
112
113
114
115
116

117
118
119
120
121
122
123
124
125
126
127
128

129
130
131
132
133
134
135

106
107
108
109
110
111
112




113

114
115
116
117
118
119
120
121
122
123

124
125
126
127
128
129
130
131








-
-
-
-
+
-










-
+








	AC_ARG_WITH([openssl-includedir],
		AS_HELP_STRING([--with-openssl-includedir=<dir>],
			[path to include directory of OpenSSL or LibreSSL installation]
		), [
			opensslincludedir="$withval"
		], [
			if test ! -z "$openssldir"; then
				if test -f "${openssldir}/include/openssl/ssl.h"; then
					opensslincludedir="${openssldir}/include/openssl"
				else
					opensslincludedir="${openssldir}/include"
				opensslincludedir="${openssldir}/include"
				fi
			else
				opensslincludedir=''
			fi
		]
	)
	AC_MSG_CHECKING([for OpenSSL include directory])
	AC_MSG_RESULT($opensslincludedir)

	dnl Set SSL include vars
	if test ! -z "$opensslincludedir"; then
		if test -f "$opensslincludedir/ssl.h"; then
		if test -f "$opensslincludedir/openssl/ssl.h"; then
			TCLTLS_SSL_CFLAGS="-I$opensslincludedir"
			TCLTLS_SSL_INCLUDES="-I$opensslincludedir"
			AC_MSG_CHECKING([for ssl.h])
			AC_MSG_RESULT([yes])
		else
			AC_MSG_CHECKING([for ssl.h])
			AC_MSG_RESULT([no])
︙
227
228
229
230
231
232
233
234

235
236
237
238
239
240
241
242
243
244
245

223
224
225
226
227
228
229

230


231
232
233
234
235
236
237
238
239








-
+
-
-










	if test -z "$TCLTLS_SSL_LIBS"; then
		TCLTLS_SSL_LIBS="-lcrypto -lssl"
	fi
	if test -z "$TCLTLS_SSL_CFLAGS"; then
		TCLTLS_SSL_CFLAGS=""
	fi
	if test -z "$TCLTLS_SSL_INCLUDES"; then
		if test -d /usr/include/openssl; then
		if test -f /usr/include/openssl/ssl.h; then
			TCLTLS_SSL_INCLUDES="-I/usr/include/openssl"
		else
			TCLTLS_SSL_INCLUDES="-I/usr/include"
		fi
	fi

	dnl Include config variables in --help list and make available to be substituted via AC_SUBST.
	AC_ARG_VAR([TCLTLS_SSL_CFLAGS], [C compiler flags for OpenSSL or LibreSSL])
	AC_ARG_VAR([TCLTLS_SSL_INCLUDES], [C compiler include paths for OpenSSL or LibreSSL])
	AC_ARG_VAR([TCLTLS_SSL_LIBS], [libraries to pass to the linker for OpenSSL or LibreSSL])
])

Modified configure from [5de0caed76] to [3cb8f6f51e].

︙
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204

9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219

9220
9221
9222
9223
9224
9225
9226

9194
9195
9196
9197
9198
9199
9200




9201

9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214

9215
9216
9217
9218
9219
9220
9221
9222








-
-
-
-
+
-













-
+








then :
  withval=$with_openssl_includedir;
			opensslincludedir="$withval"

else $as_nop

			if test ! -z "$openssldir"; then
				if test -f "${openssldir}/include/openssl/ssl.h"; then
					opensslincludedir="${openssldir}/include/openssl"
				else
					opensslincludedir="${openssldir}/include"
				opensslincludedir="${openssldir}/include"
				fi
			else
				opensslincludedir=''
			fi


fi

	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL include directory" >&5
printf %s "checking for OpenSSL include directory... " >&6; }
	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $opensslincludedir" >&5
printf "%s\n" "$opensslincludedir" >&6; }

		if test ! -z "$opensslincludedir"; then
		if test -f "$opensslincludedir/ssl.h"; then
		if test -f "$opensslincludedir/openssl/ssl.h"; then
			TCLTLS_SSL_CFLAGS="-I$opensslincludedir"
			TCLTLS_SSL_INCLUDES="-I$opensslincludedir"
			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssl.h" >&5
printf %s "checking for ssl.h... " >&6; }
			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
		else
︙
9330
9331
9332
9333
9334
9335
9336
9337

9338
9339
9340
9341
9342
9343
9344
9345
9346

9326
9327
9328
9329
9330
9331
9332

9333


9334
9335
9336
9337
9338
9339
9340








-
+
-
-








		if test -z "$TCLTLS_SSL_LIBS"; then
		TCLTLS_SSL_LIBS="-lcrypto -lssl"
	fi
	if test -z "$TCLTLS_SSL_CFLAGS"; then
		TCLTLS_SSL_CFLAGS=""
	fi
	if test -z "$TCLTLS_SSL_INCLUDES"; then
		if test -d /usr/include/openssl; then
		if test -f /usr/include/openssl/ssl.h; then
			TCLTLS_SSL_INCLUDES="-I/usr/include/openssl"
		else
			TCLTLS_SSL_INCLUDES="-I/usr/include"
		fi
	fi
︙

Powered by Fossil · RSS