From cc96a2bb2b99e62547d4279b2769d080d4eba3ef Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Sun, 8 Jun 2008 16:10:58 -0500
Subject: [PATCH] configure: Fix version comparision function.

---
 configure            |  2 +-
 scripts/config-funcs | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index ee491bb..182b9d4 100755
--- a/configure
+++ b/configure
@@ -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
 
diff --git a/scripts/config-funcs b/scripts/config-funcs
index 873b399..1b11a04 100644
--- a/scripts/config-funcs
+++ b/scripts/config-funcs
@@ -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."