[sr-dev] git:carstenbock/ims: SCSCF is now compilable

Module: sip-router Branch: carstenbock/ims Commit: 81adf157a0cd2c3d2ce215a88ff503dd97557a1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81adf15… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Dec 28 16:28:23 2010 +0100 SCSCF is now compilable --- modules/scscf/Makefile | 7 +++++++ modules/scscf/dlg_state.c | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/scscf/Makefile b/modules/scscf/Makefile index ea09637..569b398 100644 --- a/modules/scscf/Makefile +++ b/modules/scscf/Makefile @@ -11,6 +11,12 @@ include ../../Makefile.defs auto_gen= NAME=scscf.so +ifeq ($(CFG_NAME),kamailio) + DEFS+=-DSER_MOD_INTERFACE + SERLIBPATH=../../lib + SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 + #LIBS+=-L../../lib/cds -lser_cds +else ifeq ($(CFG_NAME),sip-router) DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib @@ -19,6 +25,7 @@ ifeq ($(CFG_NAME),sip-router) else LIBS+=-L../../lib/cds -l_ser_cds endif +endif DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../.. diff --git a/modules/scscf/dlg_state.c b/modules/scscf/dlg_state.c index b03da4d..f8b493c 100644 --- a/modules/scscf/dlg_state.c +++ b/modules/scscf/dlg_state.c @@ -57,11 +57,9 @@ #include "dlg_state.h" #include "../../modules/tm/tm_load.h" -#ifdef SER_MOD_INTERFACE - #include "../../modules_s/sl/sl_funcs.h" -#else - #include "../../modules/sl/sl_funcs.h" -#endif + +#include "../../modules/sl/sl_funcs.h" + #include "../../mem/shm_mem.h" #include "../../parser/parse_rr.h"