Merge pull request #147 from fdelapena/master

Fix remaining known autotools issues