Updated to match current configure options