diff --git a/autogen.sh b/autogen.sh
index 5754c4220b183f281fe68e54838de1611307d920..c1e8ad42cd62e61ee367fdd71b1cc0af52b0f5bb 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
-#!/bin/sh
+#!/bin/bash
# This script does all the magic calls to automake/autoconf and
# friends that are needed to configure a cvs checkout. As described in
FILE=inkscape.spec.in
AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.7
+AUTOMAKE_REQUIRED_VERSION=1.10
GLIB_REQUIRED_VERSION=2.0.0
INTLTOOL_REQUIRED_VERSION=0.17
check_version ()
{
- if expr "$1" \>= "$2" > /dev/null; then
+MAJOR1=`echo "$1" | cut -d"." -f1`;
+MINOR1=`echo "$1" | cut -s -d"." -f2`;
+MAJOR2=`echo "$2" | cut -d"." -f1`;
+MINOR2=`echo "$2" | cut -d"." -f2;`
+test -z "$MINOR1" && MINOR1="0";
+
+if [ "$MAJOR1" -gt "$MAJOR2" ] || [ "$MAJOR1" -eq "$MAJOR2" -a "$MINOR1" -ge "$MINOR2" ]; then
echo "yes (version $1)"
else
echo "Too old (found version $1)!"
}
echo
-echo "I am testing that you have the required versions of libtool, autoconf,"
+echo "I am testing that you have the required versions of autoconf,"
echo "automake, glib-gettextize and intltoolize. This test is not foolproof and"
echo "if anything goes wrong, there may be guidance in the file HACKING.txt"
echo
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
# Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake-1.7
- ACLOCAL=aclocal-1.7
-elif (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake-1.8
- ACLOCAL=aclocal-1.8
+if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.11
+ ACLOCAL=aclocal-1.11
+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.10
+ ACLOCAL=aclocal-1.10
elif (automake --version) < /dev/null > /dev/null 2>&1; then
# Leave unversioned automake for a last resort: it may be a version earlier
# than what we require.
ACLOCAL=aclocal
else
echo
- echo " You must have automake 1.7 or newer installed to compile $PROJECT."
- echo " Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.5.tar.gz"
- echo " (or a newer version of 1.8 if it is available; note that 1.9 is buggy)"
+ echo " You must have automake 1.10 or newer installed to compile $PROJECT."
DIE=1
fi
if test x$AUTOMAKE != x; then
VER=`$AUTOMAKE --version \
| grep automake | sed -n 's/.* \([0-9.]*\)[-a-z0-9]*$/\1/p'`
check_version "$VER" "$AUTOMAKE_REQUIRED_VERSION"
-
- # Exclude automake 1.9.[0-6]
- if expr $VER \>= 1.9.0 >/dev/null && expr $VER \<= 1.9.6 >/dev/null ; then
- echo
- echo " You must have automake less than 1.9.0 or newer than 1.9.6"
- echo " Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.5.tar.gz"
- echo " (or a newer version of 1.8 if it is available)"
- DIE=1
- fi
fi
echo -n "checking for glib-gettextize >= $GLIB_REQUIRED_VERSION ... "
attempt_command '' autoheader
}
-attempt_command '' libtoolize --copy --force
-attempt_command '' $AUTOMAKE --add-missing
+attempt_command '' $AUTOMAKE --copy --force --add-missing
attempt_command '' autoconf
attempt_command '^(Please add the files| codeset| progtest|from the|or directly|You will also|ftp://ftp.gnu.org|$)' \
glib-gettextize --copy --force