Fix comment
Use .cfp files in build dependency checks
Use chaz_CLI for --disable-threads option
Regenerate charmonizer.c