mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Fix version comparision function.

This commit is contained in:
Jonathan Moore Liles 2008-06-08 16:10:58 -05:00
parent 8ca002d200
commit cc96a2bb2b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -18,7 +18,7 @@ begin_tests
require_FLTK 1.1.7 images require_FLTK 1.1.7 images
require_command FLUID fluid require_command FLUID fluid
require_package JACK 0.103.0 jack require_package JACK 0.103.0 jack
test_version `version_of jack` -ge 0.105.0 || append "JACK_MIDI_PROTO_API=yes" test_version `version_of jack` 0.105.0 || append "JACK_MIDI_PROTO_API=yes"
require_package sigcpp 2.0.0 sigc++-2.0 require_package sigcpp 2.0.0 sigc++-2.0

16
scripts/config-funcs
View File

@ -163,20 +163,20 @@ require_package ()
_test_version () _test_version ()
{ {
[ $1 $4 $5 ] && [ $2 $4 $6 ] && [ $3 $4 $7 ] [ $1 -gt $4 ] && return 0
[ $1 -eq $4 ] && [ $2 -gt $5 ] && return 0
[ $1 -eq $4 ] && [ $2 -eq $5 ] && [ $3 -gt $6 ] && return 0
[ $1 -eq $4 ] && [ $2 -eq $5 ] && [ $3 -eq $6 ] && return 0
return 1
} }
# return true if #1 is greater than or equal to $2
test_version () test_version ()
{ {
local IFS local IFS
IFS='.' IFS='.'
if [ $2 != -ge ] && [ $2 != -le ] _test_version $1 $2
then
fatal "Syntax error"
fi
_test_version $1 $2 $3
} }
version_of () version_of ()
@ -192,7 +192,7 @@ require_FLTK ()
FLTK_VERSION=`fltk-config --version` FLTK_VERSION=`fltk-config --version`
if ! test_version $FLTK_VERSION -ge $1 if ! test_version $FLTK_VERSION $1
then then
failed failed
fatal "The installed FLTK version ($FLTK_VERSION) is too old." fatal "The installed FLTK version ($FLTK_VERSION) is too old."