Adding some changes to bin/auto-conf to make it a little more comprehensive