X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-loader.lisp;h=59baaee3822d4cfe8d81b0a0dcb477775e1c27ab;hb=2b89a1b56dfb8c1cdfaae36b2d4ff7382cff8b40;hp=71e33854da3dc5aa0d664241dbf710a9805a2084;hpb=b746611f6d622273f1563d9d0f65b59b58714694;p=clsql.git

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 71e3385..59baaee 100644
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -23,22 +23,18 @@
 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)))
-  #+clisp
-   t
-  #-clisp
   (let ((libpath (uffi:find-foreign-library
-		  "libsqlite"
+		  '("libsqlite" "sqlite")
 		  '(#+64bit "/usr/lib64/"
-		    "/usr/lib/" "/usr/local/lib/")
+		    "/usr/lib/" "/usr/local/lib/" "/bin/")
 		  :drive-letters '("C" "D" "E"))))
     (if (uffi:load-foreign-library libpath
 				   :module "sqlite"
@@ -47,7 +43,7 @@ set to the right path before compiling or loading the system.")
 	(setq *sqlite-library-loaded* t)
 	(warn "Can't load SQLite library ~A" libpath))))
 
-(clsql-base:database-type-load-foreign :sqlite)
+(clsql-sys:database-type-load-foreign :sqlite)