Adding more owner tests, and removing references to owner from a lot of other tests.

[clsql.git] / db-sqlite / sqlite-loader.lisp

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index d6254737b26004984cfef4774b1d05438164de6f..e7d4f72e32fe549590003ad39caa68b504b98ac7 100644 (file)
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -23,31 +23,20 @@
 to load the SQLite library succesfully.  If this differs at your site,
 set to the right path before compiling or loading the system.")
 
 to load the SQLite library succesfully.  If this differs at your site,
 set to the right path before compiling or loading the system.")
 

-(defvar *sqlite-library-loaded* #+clisp t
-                               #-clisp nil
-    "T if foreign library was able to be loaded successfully")
+(defvar *sqlite-library-loaded* nil
+  "T if foreign library was able to be loaded successfully")

 
 (defmethod database-type-library-loaded ((database-type (eql :sqlite)))
   "T if foreign library was able to be loaded successfully. "
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))
 
 (defmethod database-type-library-loaded ((database-type (eql :sqlite)))
   "T if foreign library was able to be loaded successfully. "
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))

-  #+clisp
-   t
-  #-clisp
-  (let ((libpath (uffi:find-foreign-library
-                 "libsqlite"
-                 '(#+64bit "/usr/lib64/"
-                   "/usr/lib/" "/usr/local/lib/")
-                 :drive-letters '("C" "D" "E"))))
-    (if (uffi:load-foreign-library libpath
-                                  :module "sqlite"
-                                  :supporting-libraries 
-                                  *sqlite-supporting-libraries*)
-       (setq *sqlite-library-loaded* t)
-       (warn "Can't load SQLite library ~A" libpath))))
+  (clsql-uffi:find-and-load-foreign-library '("libsqlite" "sqlite")
+                                            :module "sqlite"
+                                            :supporting-libraries *sqlite-supporting-libraries*)
+  (setq *sqlite-library-loaded* t))

 
 (clsql-sys:database-type-load-foreign :sqlite)
 
 
 
 (clsql-sys:database-type-load-foreign :sqlite)
 
 

-    
+