Fix autotools setup
Fixed conflict