Added dependences for new ENABLE_CFG_* options.