From 543959a705cc59ea1221a72479512b28b236513f Mon Sep 17 00:00:00 2001 From: dormando Date: Wed, 18 Nov 2015 02:21:01 -0800 Subject: [PATCH] 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. --- autogen.sh | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index e7e8a21fec..c279421b3c 100755 --- 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 index 6454a161f1..bf6ed0b1a0 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_include([m4/c99-backport.m4]) AC_INIT(memcached, VERSION_NUMBER, memcached@googlegroups.com) 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