Updated so users can build on even on systems without auto* support.