Updated to comply with new autotools