Changeset 10487

Timestamp:

Dec 5, 2006, 5:07:47 PM (19 years ago)

Author:

jhoblitt

Message:

convert from OMIT_PSDB -> HAVE_PSDB

Location:

trunk

Files:

• ppMerge/src/ppMergeConfig.c (modified) (1 diff)
• psLib/configure.ac (modified) (1 diff)
• psLib/src/db/psDB.c (modified) (2 diffs)
• psLib/src/db/psDB.h (modified) (3 diffs)
• psLib/src/sys/psConfigure.c (modified) (2 diffs)
• psModules/src/concepts/pmConcepts.c (modified) (1 diff)
• psModules/src/concepts/pmConceptsRead.c (modified) (1 diff)
• psModules/src/concepts/pmConceptsWrite.c (modified) (1 diff)
• psModules/src/config/pmConfig.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeConfig.c

@@ -68 +68 @@
     psFree(files);                      // Drop reference
 
-#ifdef DONT_USE_DB
-#ifndef OMIT_PSDB
+#ifndef DONT_USE_DB
+#ifdef HAVE_PSDB
     // Define database handle, if required
     config->database = pmConfigDB(config);

trunk/psLib/configure.ac

@@ -120 +120 @@
 
 AX_LIB_MYSQL([4.1.2],
-  [PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${MYSQL_CFLAGS}"
+  [PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${MYSQL_CFLAGS} -DHAVE_PSDB"
     PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LDFLAGS}"],
-  [PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DOMIT_PSDB"]
+  [PSLIB_CFLAGS="${PSLIB_CFLAGS=}"]
 )
 

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.118 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-28 22:41:47 $
+ *  @version $Revision: 1.119 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-06 03:01:42 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
  */
 
-#ifndef OMIT_PSDB
+#ifdef HAVE_PSDB
 
 #include <stdio.h>
@@ -2257 +2257 @@
 }
 
-#endif // OMIT_PSDB
+#endif // HAVE_PSDB

trunk/psLib/src/db/psDB.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-17 22:06:57 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-06 03:01:42 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -19 +19 @@
 #define PS_DB_H 1
 
-#ifndef OMIT_PSDB
+#ifdef HAVE_PSDB
 
 #include "psType.h"
@@ -451 +451 @@
 #else
 typedef void psDB;
-#endif // OMIT_PSDB
+#endif // HAVE_PSDB
 
 #endif // PS_DB_H

trunk/psLib/src/sys/psConfigure.c

@@ -13 +13 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-29 22:53:48 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-06 03:01:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
 
     psStringAppend(&version, " (cvs tag %s), %s, %s with"
-                   #ifdef OMIT_PSDB
+                   #ifdef HAVE_PSDB
                    "out"
                    #endif

trunk/psModules/src/concepts/pmConcepts.c

@@ -164 +164 @@
     }
 
-    #ifndef OMIT_PSDB
+    #ifdef HAVE_PSDB
     if (source & PM_CONCEPT_SOURCE_DATABASE && !(*read & PM_CONCEPT_SOURCE_DATABASE)) {
         if (p_pmConceptsReadFromDatabase(target, *specs, fpa, chip, cell, db)) {

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -353 +353 @@
     PS_ASSERT_PTR_NON_NULL(target, false);
 
-    #ifdef OMIT_PSDB
+    #ifndef HAVE_PSDB
 
     return false;

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -404 +404 @@
     }
 
-    #ifdef OMIT_PSDB
+    #ifndef HAVE_PSDB
     return false;
     #else

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-05 22:04:15 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-06 03:06:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -681 +681 @@
     PS_ASSERT_PTR_NON_NULL(config->site, NULL);
 
-    #ifdef OMIT_PSDB
+    #ifndef HAVE_PSDB
 
     return NULL;