summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Lavergne <julien.lavergne@gmail.com>2013-10-21 23:31:57 +0200
committerJulien Lavergne <julien.lavergne@gmail.com>2013-10-21 23:31:57 +0200
commit06fe6ce9326a1e50e1336cf614a077346f59df2e (patch)
treecca97ce6649c0979bcb68d431a4c34d16cbbeb2c
parent2449b84b1dcb8b690cebd59b4606c2ff8bcdb094 (diff)
Update autogen.sh to build with newer autotools
-rwxr-xr-xautogen.sh17
1 files changed, 11 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index aaaed56..a282893 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,21 +4,26 @@ AC_VERSION=
AUTOMAKE=${AUTOMAKE:-automake}
AM_INSTALLED_VERSION=$($AUTOMAKE --version | sed -e '2,$ d' -e 's/.* \([0-9]*\.[0-9]*\).*/\1/')
-if [ "$AM_INSTALLED_VERSION" != "1.10" \
- -a "$AM_INSTALLED_VERSION" != "1.11" ];then
+# FIXME: we need a better way for version check later.
+case "$AM_INSTALLED_VERSION" in
+ 1.1[1-9])
+ ;;
+ *)
echo
- echo "You must have automake > 1.10 or 1.11 installed to compile this program."
+ echo "You must have automake >= 1.11 installed."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
exit 1
-fi
+ ;;
+esac
-set -x
if [ "x${ACLOCAL_DIR}" != "x" ]; then
- ACLOCAL_ARG=-I ${ACLOCAL_DIR}
+ ACLOCAL_ARG=-I ${ACLOCAL_DIR}
fi
+set -x
+
${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG}
${AUTOHEADER:-autoheader$AC_VERSION} --force
AUTOMAKE=$AUTOMAKE libtoolize -c --automake --force