Prefer to use automake-1.8, to check that our build will still work in Scratchbox

20080417143011-53eee-4038a4fc6ce74d79b8474708fcc39769a16209df.gz

1 files changed, 13 insertions, 1 deletions

diff --git a/autogen.sh b/autogen.sh
index ee33c619f..d28e1d836 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,19 @@
 #!/bin/sh
 set -e
 
-autoreconf -i
+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 -f
 
 run_configure=true
 for arg in $*; do