Make sure only the external libpopt is used, instead of a mix between external and internal. from Brad with some tweaks
ajacoutot