1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,21 +0,0 @@ |
1 |
-# $Id$ |
|
2 |
-# |
|
3 |
-# WARNING: do not run this directly, it should be run by the master Makefile |
|
4 |
- |
|
5 |
-include ../../Makefile.defs |
|
6 |
-auto_gen= |
|
7 |
-NAME=db_unixodbc.so |
|
8 |
- |
|
9 |
-# sql.h locations (freebsd,openbsd solaris) |
|
10 |
-DEFS += -I$(LOCALBASE)/include |
|
11 |
- |
|
12 |
-# libodbc locations on RH/Suse, Solaris /OpenBSD, FreeBSD |
|
13 |
-# (Debian does the right thing and puts it in /usr/lib) |
|
14 |
-LIBS= -L$(LOCALBASE)/lib -lodbc |
|
15 |
- |
|
16 |
-DEFS+=-DKAMAILIO_MOD_INTERFACE |
|
17 |
- |
|
18 |
-SERLIBPATH=../../lib |
|
19 |
-SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 |
|
20 |
-SER_LIBS+=$(SERLIBPATH)/kcore/kcore |
|
21 |
-include ../../Makefile.modules |
- OPENSER_MOD_INTERFACE still works if used in module Makefile
... | ... |
@@ -13,7 +13,7 @@ DEFS += -I$(LOCALBASE)/include |
13 | 13 |
# (Debian does the right thing and puts it in /usr/lib) |
14 | 14 |
LIBS= -L$(LOCALBASE)/lib -lodbc |
15 | 15 |
|
16 |
-DEFS+=-DOPENSER_MOD_INTERFACE |
|
16 |
+DEFS+=-DKAMAILIO_MOD_INTERFACE |
|
17 | 17 |
|
18 | 18 |
SERLIBPATH=../../lib |
19 | 19 |
SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 |
This patch does two things:
* It links the module with the shared library libkcore which contains
strcommon files that were originally present in kamailio core and
are missing from the sip-router core.
* it fixes the path to strcommon.h to point to the header in the shared
library.
This patch makes the module compatible with the changes done in the
database library of kamailio/ser when it was converted to shared library
libsrdb1. These changes are mostly needed to avoid conflicts with the
symbols defined in the newer version of the library libsrdb2.
List of changes:
* Rename db_con_t to db1_con_t
* Rename db_res_t to db1_res_t
* Rename db field type names from DB_* to DB1_*
* Updated header paths to files in ../../lib/srdb1
* Link with libsrdb1
This patch adds -DOPENSER_MOD_INTERFACE to the modules Makefile, this
is needed to make Kamailio modules compile with the sip router core.
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3692 689a6050-402a-0410-94f2-e92a70836424
... | ... |
@@ -11,6 +11,6 @@ DEFS += -I$(LOCALBASE)/include |
11 | 11 |
|
12 | 12 |
# libodbc locations on RH/Suse, Solaris /OpenBSD, FreeBSD |
13 | 13 |
# (Debian does the right thing and puts it in /usr/lib) |
14 |
-LIBS= -L$(LOCALBASE)/lib -lodbc -lz |
|
14 |
+LIBS= -L$(LOCALBASE)/lib -lodbc |
|
15 | 15 |
|
16 | 16 |
include ../../Makefile.modules |
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3642 689a6050-402a-0410-94f2-e92a70836424
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3638 689a6050-402a-0410-94f2-e92a70836424
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,16 @@ |
1 |
+# $Id$ |
|
2 |
+# |
|
3 |
+# WARNING: do not run this directly, it should be run by the master Makefile |
|
4 |
+ |
|
5 |
+include ../../Makefile.defs |
|
6 |
+auto_gen= |
|
7 |
+NAME=unixodbc.so |
|
8 |
+ |
|
9 |
+# sql.h locations (freebsd,openbsd solaris) |
|
10 |
+DEFS += -I$(LOCALBASE)/include |
|
11 |
+ |
|
12 |
+# libodbc locations on RH/Suse, Solaris /OpenBSD, FreeBSD |
|
13 |
+# (Debian does the right thing and puts it in /usr/lib) |
|
14 |
+LIBS= -L$(LOCALBASE)/lib -lodbc -lz |
|
15 |
+ |
|
16 |
+include ../../Makefile.modules |