thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure: We don't use tail anymore, so don't check for it; move (hq) scaler check from the middle to nowhere to a more appropriate spot

Browse source 
svn-id: r39522
This commit is contained in:
Max Horn 2009-03-18 21:51:56 +00:00
parent e47e0242c9
commit 55eb3b0b26
1 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
configure vendored
View file

@ -918,22 +918,9 @@ fi
# #
# Determine the compiler version # Determine the compiler version
#
echocheck "compiler version" echocheck "compiler version"
case $_host_os in
# On Solaris, use Unix-compliant tail
solaris*)
tail=/usr/xpg4/bin/tail
;;
# All other OSes: use the tail in PATH
*)
tail=tail
;;
esac
cxx_version=`( $CXX -dumpversion ) 2>&1` cxx_version=`( $CXX -dumpversion ) 2>&1`
if test "$?" -gt 0; then if test "$?" -gt 0; then
cxx_version="not found" cxx_version="not found"
@ -978,7 +965,6 @@ fi
# #
# Do CXXFLAGS now we know the compiler version # Do CXXFLAGS now we know the compiler version
# #
if test "$_cxx_major" -ge "3" ; then if test "$_cxx_major" -ge "3" ; then
case $_host_os in case $_host_os in
mingw* | cygwin*) mingw* | cygwin*)
@ -1309,9 +1295,6 @@ add_to_config_h_if_yes $_have_x86 '#define HAVE_X86'
add_to_config_h_if_yes $_need_memalign '#define SCUMM_NEED_ALIGNMENT' add_to_config_h_if_yes $_need_memalign '#define SCUMM_NEED_ALIGNMENT'
add_to_config_mk_if_no $_build_hq_scalers 'DISABLE_HQ_SCALERS = 1'
add_to_config_mk_if_no $_build_scalers 'DISABLE_SCALERS = 1'
# #
# Check whether plugin support is requested and possible # Check whether plugin support is requested and possible
# #
@ -1411,6 +1394,12 @@ else
fi fi
add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1' add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1'
#
# Check whether to enable the (hq) scalers
#
add_to_config_mk_if_no $_build_hq_scalers 'DISABLE_HQ_SCALERS = 1'
add_to_config_mk_if_no $_build_scalers 'DISABLE_SCALERS = 1'
# #
# Check for math lib # Check for math lib
# #