[elephant-cvs] CVS elephant/src/db-bdb

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/db-bdb
In directory clnet:/tmp/cvs-serv5313/src/db-bdb

Modified Files:
	sleepycat.lisp 
Log Message:

Removed config.lisp and all Makefile related build options.  The build is
now entirely driven from the elephant.asd and ele-bdb.asd files with a 
simple user customization file, config.sexp, that should be copied to
my-config.sexp and customized to the user's environment.  Thanks to
pinterface for the initial patch supporting this approach.  Foreign
library loading is also controlled from the asd files now at system 
load time rather than at compile time.


--- /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp	2006/11/10 01:48:49	1.8
+++ /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp	2006/11/11 06:27:37	1.9
@@ -50,32 +50,7 @@
 ;;
 
 (eval-when (:compile-toplevel :load-toplevel)
-  #+linux
-  (unless
-      (uffi:load-foreign-library
-       elephant::*sleepycat-pthreads-path*
-       :module "pthread")
-    (error "Couldn't load pthread"))
-
-  (unless
-      (uffi:load-foreign-library 
-       elephant::*sleepycat-foreign-library-path*
-       :module "sleepycat")
-     (error "Couldn't load libdb (Sleepycat)!"))
-
-  (unless
-      (uffi:load-foreign-library 
-       (merge-pathnames
-	(make-pathname :name "libsleepycat" :type *c-library-extension*)
-	(merge-pathnames "src/db-bdb/" 
-			 (asdf:component-pathname (asdf:find-system 'elephant))))
-       :module "libsleepycat")
-     (error "Couldn't load libdb (Sleepycat)!")))
-
-
-  ;; Error handling 
-  ;; I put this here so we could validate that the library was loaded
-   
+
   (def-function ("db_strerr" %db-strerror)
       ((error :int))
     :returning :cstring)
@@ -93,6 +68,8 @@
 	       (db-strerror (db-error-errno condition)))))
     (:documentation "Berkeley DB / Sleepycat errors."))
 
+  )
+
 ;;
 ;; Constants and Flags
 ;; eventually write a macro which generates a custom flag function.