Patch from Peter De Wachter to improve the SBCL version detection

diff --git a/tools/config.lisp b/tools/config.lisp
index 5f74d709f35e77378374af40ba54a6e84237f084..2d3209a4dea96d95caa93e5235cedfaad7fa09a1 100644 (file)
--- a/tools/config.lisp
+++ b/tools/config.lisp
@@ -118,12 +118,12 @@ (set-dispatch-macro-character #\# #\? #'|#?-reader|)
 #+sbcl
 (progn
   (defun sbcl-version ()
 #+sbcl
 (progn
   (defun sbcl-version ()

-    (let ((dot1 (position #\. (lisp-implementation-version)))
-         (dot2 (position #\. (lisp-implementation-version) :from-end t)))
+    (let* ((dot1 (position #\. (lisp-implementation-version)))
+          (dot2 (position #\. (lisp-implementation-version) :start (1+ dot1))))

       (values 
        (parse-integer (lisp-implementation-version) :end dot1)
        (parse-integer (lisp-implementation-version) :start (1+ dot1) :end dot2)
       (values 
        (parse-integer (lisp-implementation-version) :end dot1)
        (parse-integer (lisp-implementation-version) :start (1+ dot1) :end dot2)

-       (parse-integer (lisp-implementation-version) :start (1+ dot2)))))
+       (parse-integer (lisp-implementation-version) :start (1+ dot2) :junk-allowed t))))

   (defun sbcl>= (req-major req-minor req-micro)
     (multiple-value-bind (major minor micro) (sbcl-version)      
       (or 
   (defun sbcl>= (req-major req-minor req-micro)
     (multiple-value-bind (major minor micro) (sbcl-version)      
       (or