X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-loader.lisp;h=ac77fafa4946e282aa53206895c3d2a2c550fa21;hb=c7cbd01b259a1846a5e172d69c956b836b14febb;hp=1cfcf21ffb675b52a20324907d5cb8be3bac6ff4;hpb=9bbed78051e80e6ab76ae47834136035602bbbf1;p=clsql.git

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 1cfcf21..ac77faf 100644
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Nov 2003
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -23,30 +21,20 @@
 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"
-		  '("/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-base:database-type-load-foreign :sqlite)
-
-
-    
+  (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)
+
+
+