Parcourir la source

Fix bootstrap script

The bootstrap automake version comparison only worked if the minor
version was a single digit.  Current automake has a two-digit minor
version, so the check for automake version would always fail.  Use a
full-blown version comparison that will work with current versions of
automake.
pull/1/head
Mark Schreiber il y a 9 ans
Parent
révision
ce521b9985
1 fichiers modifiés avec 9 ajouts et 1 suppressions
  1. +9
    -1
      bootstrap

+ 9
- 1
bootstrap Voir le fichier

@@ -46,9 +46,17 @@ for v in 13 12 11 10 9 8 7 6 5; do
fi
done

verlte() {
[ "$1" = "`(echo "$1"; echo "$2") | sort -V | head -n1 | tr -d '\n'`" ]
}

verlt() {
[ "$1" = "$2" ] && return 1 || verlte $1 $2
}

if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
if verlt "$amvers" 1.5; then
amvers="no"
else
amvers=""


Chargement…
Annuler
Enregistrer