[upstream] Updated text about new configure options