Update of /project/elephant/cvsroot/elephant In directory clnet:/tmp/cvs-serv29682

Modified Files: config.lisp ele-bdb.asd Log Message:

FEATURE: Allow linux users to configure pthreads location in config.lisp (NEEDS TESTING!)

--- /project/elephant/cvsroot/elephant/config.lisp 2006/02/22 21:03:47 1.2 +++ /project/elephant/cvsroot/elephant/config.lisp 2006/04/30 01:03:48 1.3 @@ -1,3 +1,14 @@ +;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;; +;;; config.lisp -- Site specific library references for Elephant +;;; +;;; Initial version 8/26/2004 by Ian Eslick +;;; ieslick@common-lisp.net +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;;

(in-package :elephant)

@@ -5,12 +16,14 @@ ;; Make sure the libraries that CLSQL needs for a particular system ;; are pointed to by these libraries. ;; These values will be irrelevant if you don't use a CLSQL-based backend. + (defparameter *clsql-foreign-lib-path* #p"/usr/local/share/common-lisp/elephant/")

;; BerkeleyDB ;; Make sure the libraries that CLSQL needs for a particular system ;; are pointed to by these libraries. + (defparameter *sleepycat-foreign-library-path* ;; Sleepycat: this works on linux #+linux @@ -24,3 +37,8 @@ ;; "/sw/lib/libdb-4.3.dylib" ;; a possible manual install "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib") + +(defparameter *sleepycat-pthreads-path* + #-linux nil ;; don't open on non-linux environments + #+linux "/lib/tls/libpthread.so.0" ;; most linux distros + ) \ No newline at end of file --- /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/02/19 20:06:03 1.8 +++ /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/04/30 01:03:48 1.9 @@ -28,28 +28,6 @@ (unless (find-package 'uffi) (asdf:operate 'asdf:load-op 'uffi)))

-;; -;; EDIT ME FOR YOUR SYSTEM -;; -;; An attempt at good defaults is here. We should -;; later add a search function that users can add to -;; so they don't have to edit source -;; - -(defparameter *sleepycat-foreign-library-path* - ;; Sleepycat: this works on linux - #+linux -;; "/db/ben/lisp/db43/lib/libdb.so" - "/usr/local/BerkeleyDB.4.3/lib/libdb-4.3.so" - ;; this works on FreeBSD - #+(and (or bsd freebsd) (not (or darwin macosx))) - "/usr/local/lib/db43/libdb.so" - #+(or darwin macosx) - ;; for Fink (OS X) -- but I will assume Linux more common... -;; "/sw/lib/libdb-4.3.dylib" - ;; a possible manual install - "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib") - (defclass bdb-c-source (c-source-file) ())