Add options to toggle inclusion of library dirs