--- autogen.sh.orig	2015-07-16 14:15:15.000000000 -0700
+++ autogen.sh	2015-07-16 14:25:37.000000000 -0700
@@ -168,7 +168,8 @@
         fi
         shift
     done
-
+    
+    ACLOCAL_FLAGS=-I`$ACLOCAL --print-ac-dir`
     cm_status=0
     if [ -n "$REQUIRED_M4MACROS" ]; then
         printbold "Checking for required M4 macros..."
@@ -265,15 +266,8 @@
     "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1
 AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
-case $REQUIRED_AUTOMAKE_VERSION in
-    1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-    1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-    1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
-    1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10" ;;
-    1.9*) automake_progs="automake-1.9 automake-1.10" ;;
-    1.10*) automake_progs="automake-1.10" ;;
-esac
+automake_progs=automake-1.16
+
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
 ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
@@ -389,8 +383,6 @@
             $AUTOMAKE --gnu --add-missing --copy || exit 1
         fi
 
-        cmp COPYING COPYING.autogen_bak || cp -pf COPYING.autogen_bak COPYING
-        cmp INSTALL INSTALL.autogen_bak || cp -pf INSTALL.autogen_bak INSTALL
         rm -f COPYING.autogen_bak INSTALL.autogen_bak
 
         cd "$topdir"