Browse Source

configure: Fix version comparision function.

tags/non-sequencer-v1.9.4
Jonathan Moore Liles 17 years ago
parent
commit
cc96a2bb2b
2 changed files with 9 additions and 9 deletions
  1. +1
    -1
      configure
  2. +8
    -8
      scripts/config-funcs

+ 1
- 1
configure View File

@@ -18,7 +18,7 @@ begin_tests
require_FLTK 1.1.7 images
require_command FLUID fluid
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



+ 8
- 8
scripts/config-funcs View File

@@ -163,20 +163,20 @@ require_package ()

_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 ()
{
local IFS
IFS='.'

if [ $2 != -ge ] && [ $2 != -le ]
then
fatal "Syntax error"
fi

_test_version $1 $2 $3
_test_version $1 $2
}

version_of ()
@@ -192,7 +192,7 @@ require_FLTK ()

FLTK_VERSION=`fltk-config --version`

if ! test_version $FLTK_VERSION -ge $1
if ! test_version $FLTK_VERSION $1
then
failed
fatal "The installed FLTK version ($FLTK_VERSION) is too old."


Loading…
Cancel
Save