Made --with-x optional.