summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authordormando <dormando@rydia.net>2008-07-24 10:57:09 -0700
committerdormando <dormando@rydia.net>2009-01-02 01:48:37 -0800
commitd0a13c2713fea80490fa96569421791c16904623 (patch)
tree81db4b07884833a8a699f046230bb6286b14d21f /autogen.sh
parent6895721413f37518140681872dd5d102253f8e42 (diff)
downloadmemcached-d0a13c2713fea80490fa96569421791c16904623.tar.gz
Add support for newer automake's.
Patch provided by facebook, attribution is to one or more of: Marc, Steve, Haiping Zhao, and Paul Saab, Steven Grimm, etc.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index 46cbeba..873f0a4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@
#
echo "aclocal..."
-ACLOCAL=`which aclocal-1.9 || which aclocal19 || which aclocal-1.7 || which aclocal17 || which aclocal-1.5 || which aclocal15 || which aclocal || exit 1`
+ACLOCAL=`which aclocal-1.10 || which aclocal-1.9 || which aclocal19 || which aclocal-1.7 || which aclocal17 || which aclocal-1.5 || which aclocal15 || which aclocal || exit 1`
$ACLOCAL || exit 1
echo "autoheader..."
@@ -16,7 +16,7 @@ AUTOHEADER=${AUTOHEADER:-autoheader}
$AUTOHEADER || exit 1
echo "automake..."
-AUTOMAKE=${AUTOMAKE:-automake-1.7}
+AUTOMAKE=`which automake-1.10 || which automake-1.9 || which automake-1.7 || exit 1`
$AUTOMAKE --foreign --add-missing || automake --gnu --add-missing || exit 1
echo "autoconf..."