Got rid of some build options that aren't needed.
Uploading for compilation on Ubuntu.