aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJonathan Gray2006-01-29 03:47:46 +0000
committerJonathan Gray2006-01-29 03:47:46 +0000
commit594d7d591d95cb5f1d7694e0a78756973a22e6ec (patch)
tree07dc8975f176ef6ec7f03e8369ce4ca882d3731f /configure
parent38ae101bdecd04501ec6b7e3dea8b8a388d09c5a (diff)
downloadscummvm-rg350-594d7d591d95cb5f1d7694e0a78756973a22e6ec.tar.gz
scummvm-rg350-594d7d591d95cb5f1d7694e0a78756973a22e6ec.tar.bz2
scummvm-rg350-594d7d591d95cb5f1d7694e0a78756973a22e6ec.zip
Allow GCC 2.95 again as compilation is now fixed.
svn-id: r20289
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 8 insertions, 9 deletions
diff --git a/configure b/configure
index 7a63b984c2..7900fb41d0 100755
--- a/configure
+++ b/configure
@@ -557,20 +557,19 @@ if test "$?" -gt 0; then
fi
case $cxx_version in
-# 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
- 3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
cxx_version="$cxx_version, ok"
cxx_verc_fail=no
;;
# whacky beos version strings
-# 2.9-beos-991026*|2.9-beos-000224*)
-# _cxx_major=2
-# _cxx_minor=95
-# cxx_version="$cxx_version, ok"
-# cxx_verc_fail=no
-# ;;
+ 2.9-beos-991026*|2.9-beos-000224*)
+ _cxx_major=2
+ _cxx_minor=95
+ cxx_version="$cxx_version, ok"
+ cxx_verc_fail=no
+ ;;
3_4)
_cxx_major=3
_mxx_minor=4
@@ -589,7 +588,7 @@ echo "$cxx_version"
if test "$cxx_verc_fail" = yes ; then
echo
echo "The version of your compiler is not supported at this time"
- echo "Please ensure you are using GCC >= 3.x"
+ echo "Please ensure you are using GCC >= 2.95"
exit 1
fi