You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tde-packaging/mandriva/2010.2/common-patches/fix_autotools.patch

35 lines
1.5 KiB

diff -Naur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-yeni/admin/cvs.sh
--- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 23:28:39.000000000 +0300
+++ kdelibs-3.5.10-yeni/admin/cvs.sh 2010-01-01 21:30:35.039582467 +0200
@@ -29,10 +29,10 @@
check_autotool_versions()
{
-required_autoconf_version="2.53 or newer"
+required_autoconf_version="2.53 or newer up to 2.65"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.60 | autoconf*2.61 | autoconf*2.62 | autoconf*2.63 | autoconf*2.65 ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.60 | autoheader*2.61 | autoheader*2.62 | autoheader*2.63 | autoheader*2.65 ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version"
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;