Trace feature test accidentally removed from makefiles, reinstated.
Remove unneeded m4 make settings.