]>
Commit | Line | Data |
---|---|---|
cc1b10c3 | 1 | diff -urN kaffeine-0.8.2/admin/cvs.sh kaffeine-0.8.2.new/admin/cvs.sh |
2 | --- kaffeine-0.8.2/admin/cvs.sh 2006-03-05 12:52:36.000000000 +0100 | |
3 | +++ kaffeine-0.8.2.new/admin/cvs.sh 2006-11-10 13:14:50.986633750 +0100 | |
4 | @@ -32,7 +32,7 @@ | |
5 | required_autoconf_version="2.53 or newer" | |
6 | AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` | |
7 | case $AUTOCONF_VERSION in | |
8 | - Autoconf*2.5* | autoconf*2.5* ) : ;; | |
9 | + Autoconf*2.[56]* | autoconf*2.[56]* ) : ;; | |
10 | "" ) | |
11 | echo "*** AUTOCONF NOT FOUND!." | |
12 | echo "*** KDE requires autoconf $required_autoconf_version" | |
13 | @@ -47,7 +47,7 @@ | |
14 | ||
15 | AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` | |
16 | case $AUTOHEADER_VERSION in | |
17 | - Autoconf*2.5* | autoheader*2.5* ) : ;; | |
18 | + Autoconf*2.[56]* | autoheader*2.[56]* ) : ;; | |
19 | "" ) | |
20 | echo "*** AUTOHEADER NOT FOUND!." | |
21 | echo "*** KDE requires autoheader $required_autoconf_version" | |
22 | @@ -68,7 +68,7 @@ | |
23 | echo "*** KDE requires automake $required_automake_version" | |
24 | exit 1 | |
25 | ;; | |
26 | - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) | |
27 | + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) | |
28 | echo "*** $AUTOMAKE_STRING found." | |
29 | UNSERMAKE=no | |
30 | ;; | |
31 | diff -urN kaffeine-0.8.2/admin/libtool.m4.in kaffeine-0.8.2.new/admin/libtool.m4.in | |
32 | --- kaffeine-0.8.2/admin/libtool.m4.in 2005-12-18 01:19:11.000000000 +0100 | |
33 | +++ kaffeine-0.8.2.new/admin/libtool.m4.in 2006-11-10 13:15:24.536730500 +0100 | |
34 | @@ -3542,7 +3542,7 @@ | |
35 | # The `*' in the case matches for architectures that use `case' in | |
36 | # $output_verbose_cmd can trigger glob expansion during the loop | |
37 | # eval without this substitution. | |
38 | - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" | |
39 | + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` | |
40 | ||
41 | for p in `eval $output_verbose_link_cmd`; do | |
42 | case $p in |