Adjustments for Autoconf and Automake