minor autotools modernization take 2