From df304c82f351cbe631f47bd27a76ff2c2bdc0d34 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Wed, 13 Oct 2010 11:09:45 +0100
Subject: [PATCH] Revert "Require aclocal 1.11.1 or above for autogen.sh"
The comparison is incorrect, and the check also breaks daily work on
autobuilders and older distros.
This reverts commit dbc4dda7f5b66c9905c3cf6e44414536a5b38177.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
autogen.sh | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 046203860..286d0fad0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if test ! -f configure.ac ; then
echo "You must execute this script from the top level directory."
@@ -9,14 +9,6 @@ set -e
rm -rf config.cache autom4te.cache
-ACLOCAL_VERSION=$(${ACLOCAL:-aclocal} --version | head -1 | \
- sed -e 's/^[^0-9]*\([0-9\.]*\)$/\1/')
-
-if [[ "$ACLOCAL_VERSION" < "1.11.1" ]]; then
- echo "aclocal version $ACLOCAL_VERSION is too old (< 1.11.1)"
- exit 1
-fi
-
${ACLOCAL:-aclocal} -I autotools
${AUTOCONF:-autoconf}
${AUTOMAKE:-automake} --add-missing
--
GitLab