autogen: Add newer automake versions

* This is kind of messy and should be re-done
  to support forward versions of automake