FIxed '--enable-bundle' for the compilation of CVS checkout.