fix configure.ac warning and use system automake

... there should always be an 'automake' alias, and we haven't had an "unsupported" version in probably ten years. hopefully this stops systems with upgraded automakes from breaking every time.
blsemo · Nov 18, 2015 · 543959a · 543959a
1 parent a66b28a
commit 543959a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/autogen.sh b/autogen.sh
@@ -39,7 +39,7 @@ $AUTOHEADER || exit 1
 
 echo "automake..."
 if test x$AUTOMAKE = x; then
-  AUTOMAKE=`locate_binary automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.7`
+  AUTOMAKE=`locate_binary automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.7 automake`
   if test x$AUTOMAKE = x; then
     die "Did not find a supported automake"
   fi

diff --git a/configure.ac b/configure.ac
@@ -4,7 +4,7 @@ m4_include([m4/c99-backport.m4])
 AC_INIT(memcached, VERSION_NUMBER, [email protected])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR(memcached.c)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC