Removed stanza in configure.ac related to removed option.
Removed a test script from the makefile template that had been moved to a different directory.