- added acc_radius, xmlrpc, rls, and dialog modules to the list

  of excluded modules
- added acc_radius to the list of RADIUS modules
- added rls and dialog to the list of presence modules
- ACC_MODULE removed
- added variable XMLRPC_MODULES
- added SERCTL_PATH (points to tools/serctl)
- compile and install libraries in sip_router/lib
- removed ser-acc-radius and ser-acc-db packages

debian/rules

@@ -29,23 +29,23 @@
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip"
 
 # modules not in the "main" package or unstable 
-EXCLUDED_MODULES=	mysql jabber auth_radius group_radius uri_radius \
-					avp_radius pa postgres snmp cpl cpl-c ext extcmd 
+EXCLUDED_MODULES=	mysql jabber acc_radius xmlrpc auth_radius group_radius uri_radius \
+					avp_radius pa rls dialog postgres snmp cpl cpl-c ext extcmd 
 
 # modules depending on mysql
 MYSQL_MODULES=mysql
 #jabber related modules
 JABBER_MODULES=jabber
 #module depending on radiusclient
-RADIUS_MODULES=auth_radius group_radius uri_radius avp_radius
+RADIUS_MODULES=acc_radius auth_radius group_radius uri_radius avp_radius
 #cpl related modules
 CPL_MODULES=cpl-c
 # pa related modules
-PA_MODULES=pa
+PA_MODULES=pa rls dialog
 # postgres modules
 POSTGRES_MODULES=postgres
-# acc module
-ACC_MODULE=acc
+# xmlrpc module
+XMLRPC_MODULES=xmlrpc
 
 # the same but with path prepended (needed for modules="...")
 MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
@@ -54,10 +54,9 @@ RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
 CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
 PA_MOD_PATH=$(addprefix modules/, $(PA_MODULES))
 POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
-ACC_MOD_PATH=$(addprefix modules/, $(ACC_MODULE))
-
-
+XMLRPC_MOD_PATH=$(addprefix modules/, $(XMLRPC_MODULES))
 
+SERCTL_PATH=tools/serctl
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -85,11 +84,13 @@ build-stamp: configure-stamp
 	$(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/ser/
 	$(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/ser/
 	$(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/ser/
+
+	# Compile shared libraries needed for presence modules
+	$(MAKE) -C lib -f Makefile.ser 
 	$(MAKE) modules modules="$(PA_MOD_PATH)" cfg-target=/etc/ser/
-	# postgres will generate lots of warnings
+	
 	$(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/ser/
-	# acc-db & acc-radius are compiled on install, because they share
-	#  the same source tree with acc
+	$(MAKE) modules modules="$(XMLRPC_MOD_PATH)" cfg-target=/etc/ser/
 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
 
 	touch build-stamp
@@ -100,9 +101,10 @@ clean:
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
+	-$(MAKE) -C lib -f Makefile.ser proper
 	-$(MAKE) \
 		include_modules="$(MYSQL_MODULES) $(JABBER_MODULES) $(RADIUS_MODULES)\
-							$(CPL_MODULES) $(PA_MODULES) $(POSTGRES_MODULES)"\
+							$(CPL_MODULES) $(PA_MODULES) $(POSTGRES_MODULES) $(XMLRPC_MODULES)"\
 							proper
 
 	dh_clean
@@ -148,12 +150,14 @@ install: build
 		cfg-target=/etc/ser/ \
 		doc-dir=share/doc/ser-cpl-module
 	#install only the pa module
+	$(MAKE) -C lib -f Makefile.ser install \
+	        prefix=$(CURDIR)/debian/ser-presence-module/usr/
 	$(MAKE) install-modules-all modules="$(PA_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/ser-pa-module \
+		basedir=$(CURDIR)/debian/ser-presence-module \
 		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/ser-pa-module \
+		cfg-prefix=$(CURDIR)/debian/ser-presence-module \
 		cfg-target=/etc/ser/ \
-		doc-dir=share/doc/ser-pa-module
+		doc-dir=share/doc/ser-presence-module
 	#install only the postgres module
 	$(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/ser-postgres-module \
@@ -161,27 +165,25 @@ install: build
 		cfg-prefix=$(CURDIR)/debian/ser-postgres-module \
 		cfg-target=/etc/ser/ \
 		doc-dir=share/doc/ser-postgres-module
-	# Ugly hacks to make 2 new versions from acc: ac_db & acc_radius
-	#install only the acc db version module
-	cd $(ACC_MOD_PATH); $(MAKE) proper; cd ../..; \
-	$(MAKE) install-modules-all modules="$(ACC_MOD_PATH)" \
-		basedir=$(CURDIR)/debian/ser-acc-db-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/ser-acc-db-module \
-		cfg-target=/etc/ser/ \
-		doc-dir=share/doc/ser-acc-db-module \
-		NAME=acc_db.so modules_names=acc_db.so EXTRA_DEFS=-DSQL_ACC ;\
-	cd $(ACC_MOD_PATH); $(MAKE) proper NAME=acc_db.so; cd ../..
-	#install only the acc radius version module
-	$(MAKE) install-modules-all modules="$(ACC_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/ser-acc-radius-module \
+	#install only the xmlrpc module
+	$(MAKE) install-modules-all modules="$(XMLRPC_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/ser-xmlrpc-module \
 		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/ser-acc-radius-module \
+		cfg-prefix=$(CURDIR)/debian/ser-xmlrpc-module \
 		cfg-target=/etc/ser/ \
-		doc-dir=share/doc/ser-acc-radius-module \
-		NAME=acc_radius.so modules_names=acc_radius.so EXTRA_DEFS=-DRAD_ACC \
-		LIBS=-lradiusclient-ng ; \
-	cd $(ACC_MOD_PATH); $(MAKE) proper NAME=acc_radius.so; cd ../..
+		doc-dir=share/doc/ser-xmlrpc-module
+	
+	# Install serctl only
+	cd $(SERCTL_PATH); \
+	$(MAKE) install \
+		usr_prefix=$(CURDIR)/debian/ser-ctl/usr \
+		var_prefix=$(CURDIR)/debian/ser-ctl/var \
+		sysconfdir=$(CURDIR)/debian/ser-ctl/etc \
+		bindir=$(CURDIR)/debian/ser-ctl/usr/bin \
+		libexecdir=$(CURDIR)/debian/ser-ctl/usr/lib \
+		datadir=$(CURDIR)/debian/ser-ctl/usr/share \
+		docdir=$(CURDIR)/debian/ser-ctl/usr/share/doc \
+		prefix=/usr
 	#dh_movefiles