Updates to work with newer autotool versions