--- tls1.6/tls.tcl Thu Mar 20 03:52:12 2008 +++ tls1.6/tls.tcl Mon Apr 21 16:36:08 2008 @@ -26,6 +26,9 @@ # Irrelevant to unixoids, but for Windows this enables the OS to find # the dependent DLL's in the CWD, where they may be. set cwd [pwd] + if {$::tcl_platform(wordSize) == 8} { + append dir "/64" + } catch {cd $dir} set res [catch {uplevel #0 [list load [file join [pwd] $dll]]} err] catch {cd $cwd} --- tls1.6.7/configure.~1~ 2015-07-07 20:16:02.000000000 +0000 +++ tls1.6.7/configure 2017-07-19 09:35:20.823716591 +0000 @@ -10345,7 +10345,12 @@ eval "LD_SEARCH_FLAGS=\"${LD_SEARCH_FLAGS}\"" if test -n "${OPENSSL}"; then - vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}" + if test "${with_ssl_dir+set}" = set; then + vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}" + else + vars="${LD_SEARCH_FLAGS} -lssl -lcrypto ${GCCPATH} ${GCCLIB}" + fi + for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then # Convert foo.lib to -lfoo for GCC. No-op if not *.lib @@ -10389,6 +10394,11 @@ else TCLSH_PROG="${TCL_BIN_DIR}/tclsh" fi + if test "$do64bit_ok" = "yes" ; then + TCLSH_PROG="${TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}" + else + TCLSH_PROG="${TCL_BIN_DIR}/${MACH32DIR}/${TCLSH_PROG}" + fi else # tclConfig.sh is in install location if test "${TEA_PLATFORM}" = "windows"; then @@ -10405,7 +10415,11 @@ break fi done - TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}" + if test "$do64bit_ok" = "yes" ; then + TCLSH_PROG="${REAL_TCL_BIN_DIR}${MACH64DIR}/${TCLSH_PROG}" + else + TCLSH_PROG="${REAL_TCL_BIN_DIR}${MACH32DIR}/${TCLSH_PROG}" + fi fi echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5 echo "${ECHO_T}${TCLSH_PROG}" >&6