Compile contrib as well
gregburek specific changes