;; 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"
((: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 ""
(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
+ (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"))))