Make the module compile in the sip-router source tree.

modules/db_berkeley/Makefile

@@ -10,10 +10,13 @@ NAME=db_berkeley.so
 
 # extra debug messages
 # -DBDB_EXTRA_DEBUG is optional
-DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
+DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
 	-I$(SYSBASE)/include
 
 
 LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb
 
+SERLIBPATH=../../lib
+SER_LIBS=$(SERLIBPATH)/srdb2/srdb2
+
 include ../../Makefile.modules

modules/db_berkeley/bdb_cmd.h

@@ -38,9 +38,9 @@
 #include <sys/time.h>
 #include <db.h>
 
-#include "../../db/db_drv.h"
-#include "../../db/db_cmd.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_cmd.h"
+#include "../../lib/srdb2/db_res.h"
 #include "../../str.h"
 
 #include "bdb_con.h"

modules/db_berkeley/bdb_con.h

@@ -36,9 +36,9 @@
 #include <time.h>
 #include <db.h>
 
-#include "../../db/db_pool.h"
-#include "../../db/db_con.h"
-#include "../../db/db_uri.h"
+#include "../../lib/srdb2/db_pool.h"
+#include "../../lib/srdb2/db_con.h"
+#include "../../lib/srdb2/db_uri.h"
 
 #include "bdb_lib.h"
 

modules/db_berkeley/bdb_fld.c

@@ -37,7 +37,7 @@
 #include <string.h>
 #include <time.h>   /* strptime, XOPEN issue must be >= 4 */
 
-#include "../../db/db_drv.h"
+#include "../../lib/srdb2/db_drv.h"
 #include "../../mem/mem.h"
 #include "../../dprint.h"
 #include "../../ut.h"

modules/db_berkeley/bdb_fld.h

@@ -36,8 +36,8 @@
 
 #include <db.h>
 
-#include "../../db/db_gen.h"
-#include "../../db/db_fld.h"
+#include "../../lib/srdb2/db_gen.h"
+#include "../../lib/srdb2/db_fld.h"
 
 typedef struct _bdb_fld {
 	db_drv_t gen;

modules/db_berkeley/bdb_lib.h

@@ -38,8 +38,8 @@
 #include <db.h>
 
 #include "../../str.h"
-#include "../../db/db.h"
-#include "../../db/db_fld.h"
+#include "../../lib/srdb2/db.h"
+#include "../../lib/srdb2/db_fld.h"
 
 /*max number of columns in a table*/
 #define MAX_NUM_COLS 32

modules/db_berkeley/bdb_mod.c

@@ -37,8 +37,8 @@
 #include "../../mem/mem.h"
 
 #include "../../sr_module.h"
-#include "../../db/db_res.h"
-#include "../../db/db.h"
+#include "../../lib/srdb2/db_res.h"
+#include "../../lib/srdb2/db.h"
 
 #include "bdb_lib.h"
 #include "bdb_con.h"

modules/db_berkeley/bdb_res.c

@@ -33,7 +33,7 @@
 
 #include "../../mem/mem.h"
 #include "../../dprint.h"
-#include "../../db/db_gen.h"
+#include "../../lib/srdb2/db_gen.h"
 
 
 void bdb_res_free(db_res_t* res, bdb_res_t *payload)

modules/db_berkeley/bdb_res.h

@@ -29,8 +29,8 @@
 #ifndef _BDB_RES_H_
 #define _BDB_RES_H_
 
-#include "../../db/db_drv.h"
-#include "../../db/db_res.h"
+#include "../../lib/srdb2/db_drv.h"
+#include "../../lib/srdb2/db_res.h"
 
 typedef struct _bdb_res {
 	db_drv_t gen;

modules/db_berkeley/bdb_uri.h

@@ -33,8 +33,8 @@
  * The functions parsing and interpreting bdb: URIs.
  */
 
-#include "../../db/db_uri.h"
-#include "../../db/db_drv.h"
+#include "../../lib/srdb2/db_uri.h"
+#include "../../lib/srdb2/db_drv.h"
 
 #include <db.h>