X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=0d564b67fdf89de8ab01cad74831a7948531d084;hp=f423927cecfb262027d2057fa504c0159237f4e2;hb=b0d8b82d162436bf2a7406b4cea489084c232a85;hpb=f10c3dcbe75b5532d6646e24ecd25f5651a0c3a9

diff --git a/clsql.asd b/clsql.asd
index f423927..0d564b6 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -18,6 +18,12 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
+#+clisp
+(progn
+  (asdf:operate 'asdf:load-op 'cffi)
+  (asdf:operate 'asdf:load-op 'cffi-uffi-compat)
+  (asdf:defsystem uffi :depends-on (cffi-uffi-compat)))
+
 ;; need to load uffi for below perform :after method
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package 'uffi)
@@ -45,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 ""
@@ -93,6 +99,9 @@ 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))
+                        (merge-pathnames
+                         (make-pathname :name ".clsql-init" :type "lisp")
+                         (user-homedir-pathname))
                         (probe-file "/etc/clsql-init.lisp")
                         #+(or mswin windows win32)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))