config.h file relocated
A line for testing purpose, removed
config.h file relocated and 'charmap option removed