Index: trunk/psModules/src/astrom/pmConcepts.h
===================================================================
--- trunk/psModules/src/astrom/pmConcepts.h	(revision 6947)
+++ trunk/psModules/src/astrom/pmConcepts.h	(revision 6955)
@@ -3,7 +3,5 @@
 
 #include "pslib.h"
-
 #include "pmFPA.h"
-
 
 // Function to call to parse a concept once it has been read
Index: trunk/psModules/src/astrom/pmConceptsRead.c
===================================================================
--- trunk/psModules/src/astrom/pmConceptsRead.c	(revision 6947)
+++ trunk/psModules/src/astrom/pmConceptsRead.c	(revision 6955)
@@ -258,4 +258,8 @@
                                )
 {
+    #ifdef OMIT_PSDB
+    return false;
+    #else
+
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
@@ -364,4 +368,5 @@
     }
     return false;
+    #endif
 }
 
Index: trunk/psModules/src/astrom/pmConceptsRead.h
===================================================================
--- trunk/psModules/src/astrom/pmConceptsRead.h	(revision 6947)
+++ trunk/psModules/src/astrom/pmConceptsRead.h	(revision 6955)
@@ -2,6 +2,6 @@
 #define PM_CONCEPTS_READ_H
 
+#include "pslib.h"
 #include "pmFPA.h"
-
 
 bool pmConceptsReadFromCamera(psMetadata *specs, // The concept specifications
Index: trunk/psModules/src/astrom/pmConceptsWrite.c
===================================================================
--- trunk/psModules/src/astrom/pmConceptsWrite.c	(revision 6947)
+++ trunk/psModules/src/astrom/pmConceptsWrite.c	(revision 6955)
@@ -404,4 +404,8 @@
                               )
 {
+    #ifdef OMIT_PSDB
+    return false;
+    #else
+
     pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
     if (!hdu) {
@@ -519,4 +523,5 @@
     }
     return false;
+    #endif
 }
 
Index: trunk/psModules/src/astrom/pmConceptsWrite.h
===================================================================
--- trunk/psModules/src/astrom/pmConceptsWrite.h	(revision 6947)
+++ trunk/psModules/src/astrom/pmConceptsWrite.h	(revision 6955)
@@ -4,6 +4,4 @@
 #include "pslib.h"
 #include "pmFPA.h"
-
-
 
 bool pmConceptsWriteToCamera(psMetadata *specs, // The concept specifications
Index: trunk/psModules/src/astrom/pmFPARead.h
===================================================================
--- trunk/psModules/src/astrom/pmFPARead.h	(revision 6947)
+++ trunk/psModules/src/astrom/pmFPARead.h	(revision 6955)
@@ -4,5 +4,4 @@
 #include "pslib.h"
 #include "pmFPA.h"
-
 
 bool pmReadoutReadNext(pmReadout *readout, // Readout into which to read
Index: trunk/psModules/src/config/pmConfig.c
===================================================================
--- trunk/psModules/src/config/pmConfig.c	(revision 6947)
+++ trunk/psModules/src/config/pmConfig.c	(revision 6955)
@@ -3,6 +3,6 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-18 22:41:40 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-22 03:20:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -561,4 +561,8 @@
     psMetadata *site)
 {
+    #ifdef OMIT_PSDB
+    return NULL;
+    #else
+
     PS_ASSERT_PTR_NON_NULL(site, NULL);
     psBool mdStatus01 = false;
@@ -577,4 +581,5 @@
 
     return(psDBInit(dbServer, dbUsername, dbPassword, dbName));
+    #endif
 }
 
Index: trunk/psModules/src/config/pmConfig.h
===================================================================
--- trunk/psModules/src/config/pmConfig.h	(revision 6947)
+++ trunk/psModules/src/config/pmConfig.h	(revision 6955)
@@ -3,6 +3,6 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:10:08 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-22 03:20:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13,5 +13,4 @@
 
 #include "pslib.h"
-
 
 // Configuration information
@@ -103,8 +102,4 @@
  *
  */
-#ifdef DOMIT_PSDB
-typedef psDB void;
-#endif
-
 psDB *pmConfigDB(
     psMetadata *site