Updated for new autotools