X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=umlisp.asd;h=03e53016ef8bf0beaf137ca2ea37c877659bcfec;hb=a58ac3e24919f15c832aafde4f0d0c40df8f353e;hp=bc97895af25f5152d42fd18066799a1c63848518;hpb=a95e40e4db96bdb764ba8be964226ba6a67354ac;p=umlisp.git

diff --git a/umlisp.asd b/umlisp.asd
index bc97895..03e5301 100644
--- a/umlisp.asd
+++ b/umlisp.asd
@@ -19,13 +19,8 @@
 (defpackage #:umlisp-system (:use #:asdf #:cl))
 (in-package #:umlisp-system)
 
-;; 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)))
-
 (defsystem umlisp
-    :components 
+    :components
   ((:file "package")
    (:file "data-structures" :depends-on ("package"))
    (:file "utils" :depends-on ("data-structures"))
@@ -38,21 +33,19 @@
    (:file "classes" :depends-on ("sql-classes"))
    (:file "class-support" :depends-on ("classes"))
    (:file "composite" :depends-on ("sql-classes")))
-  :depends-on (clsql clsql-postgresql-socket kmrcl hyperobject))
+  :depends-on (clsql clsql-mysql kmrcl hyperobject))
 
 (defmethod perform ((o test-op) (c (eql (find-system 'umlisp))))
   (operate 'load-op 'umlisp-tests)
   (operate 'test-op 'umlisp-tests :force t))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'umlisp))))
-  (let* ((init-var (uffi:getenv "UMLISPRC"))
-         (init-file (or (when init-var (probe-file init-var))
-                        (probe-file 
-                         (merge-pathnames
-                          (make-pathname :name ".umlisprc")
-                          (user-homedir-pathname)))
-                        #+(or mswin windows win32)
-                        (probe-file "c:\\etc\\umlisp-init.lisp"))))
+  (let ((init-file (or (probe-file
+                        (merge-pathnames
+                         (make-pathname :name ".umlisprc")
+                         (user-homedir-pathname)))
+                       #+(or mswin windows win32)
+                       (probe-file "c:\\etc\\umlisp-init.lisp"))))
     (when init-file
       (format t "loading umlisp init file ~A~%" init-file)
       (load init-file))))