Merge pull request #6 from dkochmanski/master

[clsql.git] / clsql.asd

diff --git a/clsql.asd b/clsql.asd
index 3f57f24f6b3d00216394eb1e3f59015fbd038ede..74afd3b6b89c22f91536fa15d7229c4ca78c2e82 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -23,6 +23,9 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   #+:clsql-cffi
   (unless (find-package 'cffi-uffi-compat)
+    #+quicklisp
+    (ql:quickload :cffi-uffi-compat)
+    #-quicklisp
     (asdf:operate 'asdf:load-op 'cffi-uffi-compat))
   #-:clsql-cffi
   (unless (find-package 'uffi)
@@ -38,6 +41,7 @@
 the Xanalys CommonSQL interface for Lispworks. It provides low-level
 database interfaces as well as a functional and an object
 oriented interface."
+    :version "6.4"
     :components
     ((:module sql
              :components
@@ -87,7 +91,8 @@ oriented interface."
                        :pathname ""
                        :components ((:file "generic-postgresql")
                                     (:file "generic-odbc")
-                                    (:file "sequences"))
+                                    (:file "sequences")
+                                    (:file "command-object"))
                        :depends-on (functional))))))
 
 
@@ -96,7 +101,7 @@ oriented interface."
   (operate 'test-op 'clsql-tests :force t))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
-  (let* ((init-var (uffi:getenv "CLSQLINIT"))
+  (let* ((init-var (uffi::getenv "CLSQLINIT"))
          (init-file (or (when init-var (probe-file init-var))
                         (probe-file
                          (concatenate 'string