Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -50,20 +50,10 @@
 # This is a list of public header files to be installed, if any.
 #========================================================================
 
 PKG_HEADERS	= @PKG_HEADERS@
 
-#========================================================================
-# SSL
-#========================================================================
-
-SSL_DIR			= @SSL_DIR@
-SSL_LIB_DIR 		= @SSL_LIB_DIR@
-SSL_INCLUDE_DIR 	= @SSL_INCLUDE_DIR@
-SSL_INCLUDE_DIR_NATIVE	= @SSL_INCLUDE_DIR_NATIVE@
-SSL_INCLUDES 		= -I$(SSL_INCLUDE_DIR_NATIVE)
-
 #========================================================================
 # "PKG_LIB_FILE" refers to the library (dynamic or static as per
 # configuration options) composed of the named objects.
 #========================================================================
 

Index: configure
==================================================================
--- configure
+++ configure
@@ -646,18 +646,14 @@
 
 ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 GEN_DH_PARAMS_ARGS
 TCLSH_PROG
-SSL_LIB_DIR_NATIVE
-SSL_INCLUDE_DIR_NATIVE
-SSL_INCLUDE_DIR
-SSL_LIB_DIR
-SSL_DIR
 TCLTLS_SSL_CPPFLAGS
 TCLTLS_SSL_CFLAGS
 TCLTLS_SSL_LIBS
+PKGCONFIG
 VC_MANIFEST_EMBED_EXE
 VC_MANIFEST_EMBED_DLL
 RANLIB_STUB
 MAKE_STUB_LIB
 MAKE_STATIC_LIB
@@ -9128,22 +9124,10 @@
 	fi
 
 			TCLTLS_SSL_LIBS="${new_TCLTLS_SSL_LIBS_normal} ${new_TCLTLS_SSL_LIBS_static}"
 		fi
 	fi
-
-	SSL_DIR="/usr"
-	SSL_LIB_DIR=${SSL_DIR}/lib64
-	SSL_INCLUDE_DIR=${SSL_DIR}/include/openssl
-
-
-
-
-
-    SSL_INCLUDE_DIR_NATIVE=\"`${CYGPATH} ${SSL_INCLUDE_DIR}`\"
-    SSL_LIB_DIR_NATIVE=\"`${CYGPATH} ${SSL_LIB_DIR}`\"
-
 
 
 #--------------------------------------------------------------------
 # Shared libraries and static libraries have different names.
 # Also, windows libraries and unix libraries have different names.
@@ -9152,37 +9136,22 @@
 #--------------------------------------------------------------------
 
 if test "${TEA_PLATFORM}" = "windows" ; then
     if test "$GCC" = "yes"; then
 
-    vars="-I${SSL_INCLUDE_DIR_NATIVE}"
+    PKG_CFLAGS="$PKG_CFLAGS ${TCLTLS_SSL_CFLAGS}"
+
+
+
+    vars="${TCLTLS_SSL_CPPFLAGS}"
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
 
 
 
-    vars="-L${SSL_LIB_DIR_NATIVE}"
-    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
-	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.[lL][iI][bB]$/-l\1/'`
-	fi
-	PKG_LIBS="$PKG_LIBS $i"
-    done
-
-
-    else
-
-    vars="-include:${SSL_INCLUDE_DIR_NATIVE}"
-    for i in $vars; do
-	PKG_INCLUDES="$PKG_INCLUDES $i"
-    done
-
-
-
-    vars="-libpath:${SSL_LIB_DIR_NATIVE}"
+    vars="${TCLTLS_SSL_LIBS}"
     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
 	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.[lL][iI][bB]$/-l\1/'`
 	fi
@@ -9189,34 +9158,24 @@
 	PKG_LIBS="$PKG_LIBS $i"
     done
 
 
     fi
-
-    vars="libcrypto.lib libssl.lib"
-    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
-	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.[lL][iI][bB]$/-l\1/'`
-	fi
-	PKG_LIBS="$PKG_LIBS $i"
-    done
-
-
 else
-    # Subst runtime dir here, use -R and -L where necessary. [Bug 1742859]
-    LIB_RUNTIME_DIR=${SSL_LIB_DIR}
-    eval "LD_SEARCH_FLAGS=\"${LD_SEARCH_FLAGS}\""
 
-    vars="-I${SSL_INCLUDE_DIR}"
+    PKG_CFLAGS="$PKG_CFLAGS ${TCLTLS_SSL_CFLAGS}"
+
+
+
+    vars="${TCLTLS_SSL_CPPFLAGS}"
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
 
 
 
-    vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}"
+    vars="${TCLTLS_SSL_LIBS}"
     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
 	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.[lL][iI][bB]$/-l\1/'`
 	fi

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -166,46 +166,27 @@
 # OpenSSL or LibreSSL config.
 #--------------------------------------------------------------------
 
 TCLTLS_SSL_OPENSSL
 
-# Temp work-around
-SSL_DIR="/usr"
-SSL_LIB_DIR=${SSL_DIR}/lib64
-SSL_INCLUDE_DIR=${SSL_DIR}/include/openssl
-
-AC_SUBST(SSL_DIR)
-AC_SUBST(SSL_LIB_DIR)
-AC_SUBST(SSL_INCLUDE_DIR)
-
-SSL_INCLUDE_DIR_NATIVE=\"`${CYGPATH} ${SSL_INCLUDE_DIR}`\"
-SSL_LIB_DIR_NATIVE=\"`${CYGPATH} ${SSL_LIB_DIR}`\"
-AC_SUBST(SSL_INCLUDE_DIR_NATIVE)
-AC_SUBST(SSL_LIB_DIR_NATIVE)
-
 #--------------------------------------------------------------------
 # Shared libraries and static libraries have different names.
 # Also, windows libraries and unix libraries have different names.
 # For the OpenSSL version, I chose to use the same library names that
 # OpenSSL uses as its default names.
 #--------------------------------------------------------------------
 
 if test "${TEA_PLATFORM}" = "windows" ; then
     if test "$GCC" = "yes"; then
-	TEA_ADD_INCLUDES([-I${SSL_INCLUDE_DIR_NATIVE}])
-	TEA_ADD_LIBS([-L${SSL_LIB_DIR_NATIVE}])
-    else
-	TEA_ADD_INCLUDES([-include:${SSL_INCLUDE_DIR_NATIVE}])
-	TEA_ADD_LIBS([-libpath:${SSL_LIB_DIR_NATIVE}])
+	TEA_ADD_CFLAGS([${TCLTLS_SSL_CFLAGS}])
+	TEA_ADD_INCLUDES([${TCLTLS_SSL_CPPFLAGS}])
+	TEA_ADD_LIBS([${TCLTLS_SSL_LIBS}])
     fi
-    TEA_ADD_LIBS([libcrypto.lib libssl.lib])
 else
-    # Subst runtime dir here, use -R and -L where necessary. [Bug 1742859]
-    LIB_RUNTIME_DIR=${SSL_LIB_DIR}
-    eval "LD_SEARCH_FLAGS=\"${LD_SEARCH_FLAGS}\""
-    TEA_ADD_INCLUDES([-I${SSL_INCLUDE_DIR}])
-    TEA_ADD_LIBS([${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}])
+	TEA_ADD_CFLAGS([${TCLTLS_SSL_CFLAGS}])
+	TEA_ADD_INCLUDES([${TCLTLS_SSL_CPPFLAGS}])
+	TEA_ADD_LIBS([${TCLTLS_SSL_LIBS}])
 fi
 
 #--------------------------------------------------------------------
 # Determine the name of the tclsh and/or wish executables in the
 # Tcl and Tk build directories or the location they were installed