[elephant-cvs] CVS elephant

[ieslick]

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

Modified Files:
	config.sexp 
Log Message:
Clean up config.sexp defaults

--- /project/elephant/cvsroot/elephant/config.sexp	2007/04/30 00:38:29	1.12
+++ /project/elephant/cvsroot/elephant/config.sexp	2007/05/31 19:52:32	1.13
@@ -1,26 +1,18 @@
-#+(and (or sbcl allegro) (not mswindows) (not windows))
-((:compiler . :gcc)
- (:berkeley-db-include-dir . "/opt/local/include/db45/")
- (:berkeley-db-lib-dir . "/opt/local/lib/db45/")
- (:berkeley-db-lib . "/opt/local/lib/db45/libdb-4.5.dylib")
- (:berkeley-db-deadlock . "/opt/local/bin/db45_deadlock")
- (:berkeley-db-cachesize . 20971520)
- (:berkeley-db-map-degree2 . t)
- (:clsql-lib-paths . nil)
- (:prebuilt-libraries . nil))
- 
 
-#+openmcl
+;; Linux defaults
+#+(and (or sbcl allegro openmcl lispworks) (not (or mswindows windows)) (not (or macosx darwin)))
 ((:compiler . :gcc)
  (:berkeley-db-include-dir . "/usr/local/BerkeleyDB.4.5/include/")
  (:berkeley-db-lib-dir . "/usr/local/BerkeleyDB.4.5/lib/")
- (:berkeley-db-lib . "/usr/local/BerkeleyDB.4.5/lib/libdb-4.5.dylib")
+ (:berkeley-db-lib . "/usr/local/BerkeleyDB.4.5/lib/libdb-4.5.so")
+ (:berkeley-db-deadlock . "/usr/local/BerkeleyDB.4.5/bin/db_deadlock")
  (:berkeley-db-cachesize . 20971520)
  (:berkeley-db-map-degree2 . t)
- (:prebuilt-libraries . nil)
- (:clsql-lib-paths . nil))
+ (:clsql-lib-paths . nil)
+ (:prebuilt-libraries . nil))
 
-#+(and lispworks (not mswindows))
+;; OSX Defaults 
+#+(and (or sbcl allegro openmcl lispworks) (not (or mswindows windows)) (or macosx darwin))
 ((:compiler . :gcc)
  (:berkeley-db-include-dir . "/usr/local/BerkeleyDB.4.5/include/")
  (:berkeley-db-lib-dir . "/usr/local/BerkeleyDB.4.5/lib/")
@@ -28,9 +20,10 @@
  (:berkeley-db-deadlock . "/usr/local/BerkeleyDB.4.5/bin/db_deadlock")
  (:berkeley-db-cachesize . 20971520)
  (:berkeley-db-map-degree2 . t)
- (:prebuilt-libraries . nil)
- (:clsql-lib-paths . nil))
+ (:clsql-lib-paths . nil)
+ (:prebuilt-libraries . nil))
 
+;; Windows defaults (assumes prebuild libraries)
 #+(or mswindows windows)
 ((:compiler . :cygwin)
  (:berkeley-db-include-dir . "C:/Program Files/Oracle/Berkeley DB 4.5.20/include/")