X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi-loader.lisp;h=8b9efb7207601f7c490d0898d73e7dba28125945;hb=2b89a1b56dfb8c1cdfaae36b2d4ff7382cff8b40;hp=fc9f3d842b9c38ae727d0ec4a9a50c230aedc2cc;hpb=eb21ebac347671b183a2250bbb4f233e66bf86d6;p=clsql.git

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index fc9f3d8..8b9efb7 100644
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -2,14 +2,14 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          clsql-uffi-loader.sql
-;;;; Purpose:       library loader using CLSQL UFFI helper library
-;;;; Programmers:   Kevin M. Rosenberg
-;;;; Date Started:  Mar 2002
+;;;; Name:     clsql-uffi-loader.sql
+;;;; Purpose:  Library loader using CLSQL UFFI helper library
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi-loader.lisp,v 1.5 2003/07/08 20:15:13 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -20,11 +20,9 @@
 
 (defvar *clsql-uffi-library-filename* 
   (uffi:find-foreign-library
-   "clsql-uffi"
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     "/usr/lib/clsql/"
-     "/opt/lisp/clsql/uffi/"
-     "/home/kevin/debian/src/clsql/uffi/")
+   '(#+(or 64bit x86-64) "uffi64" "uffi")
+   `(,clsql-uffi-system::*library-file-dir*
+     "/usr/lib/clsql/")
    :drive-letters '("C")))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
@@ -37,7 +35,7 @@ set to the right path before compiling or loading the system.")
 
 (defun load-uffi-foreign-library ()
   (unless (probe-file *clsql-uffi-library-filename*)
-    (error "Unable to find clsql-uffi.so"))
+    (error "Unable to find uffi.so"))
   
   (if (uffi:load-foreign-library *clsql-uffi-library-filename* 
 				 :module "clsql-uffi" 
@@ -48,5 +46,3 @@ set to the right path before compiling or loading the system.")
 
 (load-uffi-foreign-library)
 
-
-