X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.asd;h=7d267623f5a1ea36d46080ac801bfb69efe9faff;hb=6828cb461404126aa0c334fe2b669d435304f73e;hp=26ee04fafeb63850851ac7fda87b9cc1060a0935;hpb=9a3ce518152a2f74eda63d467ad9f8b8594da776;p=clsql.git

diff --git a/clsql.asd b/clsql.asd
index 26ee04f..7d26762 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -27,7 +27,7 @@
 ;; need to load uffi for below perform :after method
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package 'uffi)
-    (asdf:operate 'asdf:load-op 'uffi)))
+    (asdf:operate 'asdf:load-op 'cffi-uffi-compat)))
 
 (defsystem clsql
     :name "CLSQL"
@@ -60,7 +60,7 @@ oriented interface."
                         ((:file "initialize")
 			 (:file "database" :depends-on ("initialize"))
 			 (:file "recording" :depends-on ("database"))
-			 (:file "pool"))
+			 (:file "pool" :depends-on ("database")))
                         :depends-on (base))
 	       (:module syntax
 			:pathname ""
@@ -88,7 +88,8 @@ oriented interface."
 			:pathname ""
 			:components ((:file "generic-postgresql")
 				     (:file "generic-odbc")
-				     (:file "sequences"))
+				     (:file "sequences")
+				     (:file "command-object"))
 			:depends-on (functional))))))
 
 
@@ -99,6 +100,10 @@ oriented interface."
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
   (let* ((init-var (uffi:getenv "CLSQLINIT"))
          (init-file (or (when init-var (probe-file init-var))
+                        (probe-file
+                         (concatenate 'string
+                                      (namestring (user-homedir-pathname))
+                                      ".clsql-init.lisp"))
                         (probe-file "/etc/clsql-init.lisp")
                         #+(or mswin windows win32)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))