Fixes #374
This MR contains a couple of cleanups of the option-file handling when using configure or cmake command.
configure
cmake