Diff of /autogen.sh [bb3b1f] .. [3688cf] Maximize Restore

  Switch to unified view

a/autogen.sh b/autogen.sh
...
...
22
ORIGDIR=`pwd`
22
ORIGDIR=`pwd`
23
cd $srcdir
23
cd $srcdir
24
24
25
check_version ()
25
check_version ()
26
{
26
{
27
    if expr $1 \>= $2 > /dev/null; then
27
    VERSION_A=$1
28
  echo "yes (version $1)"
28
    VERSION_B=$2
29
30
    save_ifs="$IFS"
31
    IFS=.
32
    set dummy $VERSION_A 0 0 0
33
    MAJOR_A=$2
34
    MINOR_A=$3
35
    MICRO_A=$4
36
    set dummy $VERSION_B 0 0 0
37
    MAJOR_B=$2
38
    MINOR_B=$3
39
    MICRO_B=$4
40
    IFS="$save_ifs"
41
42
    if expr "$MAJOR_A" = "$MAJOR_B" > /dev/null; then
43
        if expr "$MINOR_A" \> "$MINOR_B" > /dev/null; then
44
           echo "yes (version $VERSION_A)"
45
        elif expr "$MINOR_A" = "$MINOR_B" > /dev/null; then
46
            if expr "$MICRO_A" \>= "$MICRO_B" > /dev/null; then
47
               echo "yes (version $VERSION_A)"
48
            else
49
                echo "Too old (version $VERSION_A)"
50
                DIE=1
51
            fi
52
        else
53
            echo "Too old (version $VERSION_A)"
54
            DIE=1
55
        fi
56
    elif expr "$MAJOR_A" \> "$MAJOR_B" > /dev/null; then
57
  echo "Major version might be too new ($VERSION_A)"
29
    else
58
    else
30
    echo "Too old (found version $1)!"
59
    echo "Too old (version $VERSION_A)"
31
    DIE=1
60
    DIE=1
32
    fi
61
    fi
33
}
62
}
34
63
35
echo
64
echo
...
...
60
   AUTOMAKE=automake-1.8
89
   AUTOMAKE=automake-1.8
61
   ACLOCAL=aclocal-1.8
90
   ACLOCAL=aclocal-1.8
62
elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
91
elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
63
   AUTOMAKE=automake-1.9
92
   AUTOMAKE=automake-1.9
64
   ACLOCAL=aclocal-1.9
93
   ACLOCAL=aclocal-1.9
94
elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
95
   AUTOMAKE=automake-1.10
96
   ACLOCAL=aclocal-1.10
65
elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then
97
elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then
66
   AUTOMAKE=automake-1.6
98
   AUTOMAKE=automake-1.6
67
   ACLOCAL=aclocal-1.6
99
   ACLOCAL=aclocal-1.6
68
else
100
else
69
    echo
101
    echo