X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.asd;h=0e1a302907af0770c3c8d6edc4153168bee99f6f;hb=704367c500a9fac40e97663f794fa4042df1512a;hp=1a5fcdf1c18fdfce2d5f1c1f1619405955584231;hpb=ed3fc2379a78875cf80cdb4d000c0bfdf8806fe7;p=clsql.git

diff --git a/clsql.asd b/clsql.asd
index 1a5fcdf..0e1a302 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -51,8 +51,8 @@ oriented interface."
 			 (:file "base-classes" :depends-on ("package"))
                          (:file "conditions" :depends-on ("base-classes"))
                          (:file "db-interface" :depends-on ("conditions"))
-			 (:file "time" :depends-on ("package" "conditions"))
 			 (:file "utils" :depends-on ("package" "db-interface"))
+			 (:file "time" :depends-on ("package" "conditions" "utils"))
                          (:file "generics" :depends-on ("package"))))
                (:module database
                         :pathname ""
@@ -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 ""
@@ -99,8 +99,12 @@ 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)
+                        #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))