Further autotools magic