Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -32,33 +32,35 @@
 	$(AR) rcu static-@EXTENSION_TARGET@ tls.o tlsBIO.o tlsIO.o tlsX509.o
 	-$(RANLIB) static-@EXTENSION_TARGET@
 
 # Dependencies for all our targets
 tls.o: @srcdir@/tls.c @srcdir@/tlsInt.h @srcdir@/tclOpts.h tls.tcl.h dh_params.h Makefile
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o tls.o -c @srcdir@/tls.c
+
 tlsBIO.o: @srcdir@/tlsBIO.c @srcdir@/tlsInt.h Makefile
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o tlsBIO.o -c @srcdir@/tlsBIO.c
+
 tlsIO.o: @srcdir@/tlsIO.c @srcdir@/tlsInt.h Makefile
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o tlsIO.o -c @srcdir@/tlsIO.c
+
 tlsX509.o: @srcdir@/tlsX509.c @srcdir@/tlsInt.h Makefile
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o tlsX509.o -c @srcdir@/tlsX509.c
 
 # Create a C-source-ified version of the script resources
 # for TclTLS so that we only need a single file to enable
 # this extension
 tls.tcl.h: @srcdir@/tls.tcl Makefile
 	od -A n -v -t xC < '@srcdir@/tls.tcl' > tls.tcl.h.new.1
-	sed 's@  *@@g;s@..@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2
+	sed 's@[^0-9A-Fa-f]@@g;s@..@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2
 	rm -f tls.tcl.h.new.1
 	mv tls.tcl.h.new.2 tls.tcl.h
 
 # Create default DH parameters
 dh_params.h: @srcdir@/gen_dh_params Makefile
 	sh @srcdir@/gen_dh_params @GEN_DH_PARAMS_ARGS@ > dh_params.h.new
 	mv dh_params.h.new dh_params.h
 
-# Generic target for building files from the "srcdir"
-# tree -- the default target will not match paths
-.c.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o "$@" -c "$<"
-
 # Install the extension
 install: @EXTENSION_TARGET@ pkgIndex.tcl
 	$(INSTALL) -d '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
 	$(INSTALL_PROGRAM) @EXTENSION_TARGET@ '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
 	$(INSTALL_DATA)    pkgIndex.tcl '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
@@ -77,10 +79,11 @@
 clean:
 	rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o
 	rm -f @EXTENSION_TARGET@ shared-@EXTENSION_TARGET@ static-@EXTENSION_TARGET@
 	rm -f shared-@EXTENSION_TARGET@.def shared-@EXTENSION_TARGET@.lib
 	rm -f tls.tcl.h tls.tcl.h.new.1 tls.tcl.h.new.2
+	rm -f tcltls.syms
 
 # Clean the local build directory back to what it was after unpacking the
 # distribution tarball
 distclean: clean
 	rm -f config.log config.status

Index: README.txt
==================================================================
--- README.txt
+++ README.txt
@@ -16,10 +16,12 @@
 For best security and function, always compile from source with the latest
 official release of OpenSSL (http://www.openssl.org/).
 
 TLS 1.7 and newer require Tcl 8.4.0+, older versions may be used if older
 versions of Tcl need to be used.
+
+TclTLS requires OpenSSL or LibreSSL in order to be compiled and function.
 
 Non-exclusive credits for TLS are:
    Original work: Matt Newman @ Novadigm
    Updates: Jeff Hobbs @ ActiveState
    Tcl Channel mechanism: Andreas Kupries

Index: aclocal/ax_check_compile_flag.m4
==================================================================
--- aclocal/ax_check_compile_flag.m4
+++ aclocal/ax_check_compile_flag.m4
@@ -17,11 +17,11 @@
 #   If EXTRA-FLAGS is defined, it is added to the current language's default
 #   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
 #   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
 #   force the compiler to issue an error when a bad flag is given.
 #
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#   INPUT gives an alternative input source to AC_LINK_IFELSE.
 #
 #   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
 #   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
 #
 # LICENSE
@@ -40,14 +40,14 @@
 [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
 AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
 AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
   ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
   _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
     [AS_VAR_SET(CACHEVAR,[yes])],
     [AS_VAR_SET(CACHEVAR,[no])])
   _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
 AS_VAR_IF(CACHEVAR,yes,
   [m4_default([$2], :)],
   [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
 ])dnl AX_CHECK_COMPILE_FLAGS

Index: autogen.sh
==================================================================
--- autogen.sh
+++ autogen.sh
@@ -73,7 +73,12 @@
 	echo "automake failed" >&2
 	exit 1
 fi
 
 autoconf
+
+if grep AC_COMPILE_IFELSE aclocal/ax_check_compile_flag.m4 >/dev/null; then
+	sed 's@AC_COMPILE_IFELSE@AC_LINK_IFELSE@g' aclocal/ax_check_compile_flag.m4 > aclocal/ax_check_compile_flag.m4.new
+	mv aclocal/ax_check_compile_flag.m4.new aclocal/ax_check_compile_flag.m4
+fi
 
 rm -rf autom4te.cache