X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/ec75b3fc8610f97c7cfffb0e06187a75fd43acfd..4bd4e5832af5fb46c121330ee60e9ccdbcfe7df3:/tools/config.lisp

diff --git a/tools/config.lisp b/tools/config.lisp
index 5f74d70..bfc660d 100644
--- a/tools/config.lisp
+++ b/tools/config.lisp
@@ -68,8 +68,7 @@
   (split-string (first (run-pkg-config package t "--libs"))))
 
 
-(defun pkg-exists-p (package &key version atleast-version max-version
-		     ( error t))
+(defun pkg-exists-p (package &key version atleast-version max-version error)
   (let ((version-check
 	 (cond
 	  (version (format nil "= ~A" version))
@@ -118,12 +117,12 @@
 #+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)
-       (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