Updated, with flameeyes autoconf changes

You'll need to remove some unmergeable commits on your branch