1 files changed, 10 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index ee10f482..fdbb9642 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
 set -e
 
-if test -z "$MAKE"
-then
-	MAKE=make
+if test -n "$AUTOMAKE"; then
+    : # don't override an explicit user request
+elif automake-1.8 --version &>/dev/null && \
+     aclocal-1.8 --version &>/dev/null; then
+    # If we have automake-1.8, use it. This helps to ensure that our build
+    # system doesn't accidentally grow automake-1.9 dependencies.
+    AUTOMAKE=automake-1.8
+    export AUTOMAKE
+    ACLOCAL=aclocal-1.8
+    export ACLOCAL
 fi
 
 autoreconf -i