Merge branch 'master' into next

* master:
  Remove legacy config cache files when cleaning up
  If TCL cannot be found, disable it for the remainder of configure to avoid fatal errors with version check

Makefile.in

@@ -100,14 +100,14 @@ clean:  cleanutils
 	+@cd src/crypto && $(MAKE) clean
 	+@cd src/mod && $(MAKE) distclean
 	-+@cd lib && $(MAKE) clean
-	@rm -f $(BINEXEC) build/stamp.* *~ src/*~ configure.temp .mangled
+	@rm -f $(BINEXEC) build/stamp.* *~ src/*~ configure.temp .mangled stamp.*
 	@rm -f src/help.h src/response.h src/responses.h utctime@EXEEXT@ ts@EXEEXT@
 
 distclean: clean
 	@rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan
 	@rm -rf src/.deps/ src/compat/.deps/ src/strucutres/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps src/.defs/
 	-+@cd lib && $(MAKE) distclean
-	@rm -f $(STATICMAKEFILES) $(CONFIGFILES)
+	@rm -f $(STATICMAKEFILES) $(CONFIGFILES) config.h config.log config.status config.cache
 
 
 distrib: clean

build/autotools/includes/libtcl.m4

@@ -408,6 +408,7 @@ configure: error:
   --with-tclinc='/path/to/tcl.h' options.
 
 EOF
+    enable_script_tcl="no"
     else
       AC_DEFINE(HAVE_LIBTCL, 1, [Define if you have support for libtcl])
     fi

configure

@@ -5928,6 +5928,7 @@ configure: error:
   --with-tclinc='/path/to/tcl.h' options.
 
 EOF
+    enable_script_tcl="no"
     else
 
 $as_echo "#define HAVE_LIBTCL 1" >>build/confdefs.h