X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-sqlite%2Fsqlite-loader.lisp;h=27bea2027750a8a60c4e71fb85f002f91ba29065;hb=e3924d6e872f06dce33c923b15c5d30baa31460c;hp=5b1eef981062e58931cf65fbe2b44159bf2afa30;hpb=fd3c9c9f21ff40904bf27eb7a797bbd6c2d80630;p=clsql.git

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 5b1eef9..27bea20 100644
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Nov 2003
 ;;;;
-;;;; $Id: sqlite-loader.lisp,v 1.2 2003/12/03 14:07:31 aurelio Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli
 ;;;;
@@ -16,37 +16,27 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package :clsql-sqlite)
+(in-package #:clsql-sqlite)
 
 (defvar *sqlite-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld
 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-sys: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)