@@ -19,14 +19,14 @@
 INSTDIR="$(pwd)/inst"
 PATCHDIR="$(pwd)/patches"
 export TLSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
 
 # Set configure options for this sub-project
-LDFLAGS="${KC_TLS_LDFLAGS}"
-CFLAGS="${KC_TLS_CFLAGS}"
-CPPFLAGS="${KC_TLS_CPPFLAGS}"
-LIBS="${KC_TLS_LIBS}"
+LDFLAGS="${LDFLAGS} ${KC_TLS_LDFLAGS}"
+CFLAGS="${CFLAGS} ${KC_TLS_CFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${KC_TLS_CPPFLAGS}"
+LIBS="${LIBS} ${KC_TLS_LIBS}"
 export LDFLAGS CFLAGS CPPFLAGS LIBS
 
 rm -rf 'build' 'out' 'inst'
 mkdir 'build' 'out' 'inst' || exit 1
 
@@ -53,10 +53,16 @@
 		gzip -dc "../${SRC}" | tar -xf -
 	else    
 		cp -rp ../buildsrc/* './'
 	fi
 
+	# Determine SSL directory
+	if [ -z "${CPP}" ]; then
+		CPP="${CC} -E"
+	fi
+	SSLDIR="$(echo '#include <openssl/ssl.h>' 2>/dev/null | ${CPP} - | awk '/# 1 "\/.*\/ssl\.h/{ print $3; exit }' | sed 's@^"@@;s@"$@@;s@/include/openssl/ssl\.h$@@')"
+
 	# Apply required patches
 	cd "${BUILDDIR}" || exit 1
 	for patch in "${PATCHDIR}/all"/tls-${TLSVERS}-*.diff "${PATCHDIR}/${TCL_VERSION}"/tls-${TLSVERS}-*.diff; do
 		if [ ! -f "${patch}" ]; then
 			continue
@@ -110,12 +116,12 @@
 		fi
 		cat configure.new > configure
 		rm -f configure.new
 
 		(
-			echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
-			./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
+			echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" --with-ssl-dir=\"${SSLDIR}\" ${CONFIGUREEXTRA}"
+			./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}" ${CONFIGUREEXTRA}
 
 			echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\""
 			${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" || exit 1
 
 			echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\" install"