[sr-dev] git:master: ims_isc: fix cross-compilation

[Ovidiu Sas]

Module: sip-router
Branch: master
Commit: 7b483c4cd97d61c8eefc484d31ffb3ba43d03ca5
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b483c4cd97d61c8eefc484d31ffb3ba43d03ca5

Author: Ovidiu Sas <osas at voipembedded.com>
Committer: Ovidiu Sas <osas at voipembedded.com>
Date:   Thu Jan 10 16:43:05 2013 -0500

ims_isc: fix cross-compilation

---

 modules/ims_isc/Makefile  |   19 ++++++++++++-------
 modules/ims_isc/checker.h |    1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/ims_isc/Makefile b/modules/ims_isc/Makefile
index 0b6d6a1..5690e5e 100644
--- a/modules/ims_isc/Makefile
+++ b/modules/ims_isc/Makefile
@@ -7,17 +7,22 @@
 include ../../Makefile.defs
 auto_gen=
 NAME=ims_isc.so
-LIBS=
 
-DEFS += -DOPENSER_MOD_INTERFACE
-
-DEFS += -I/usr/include/libxml2
-LIBS += -L$(LOCALBASE)/lib -lxml2
+ifeq ($(CROSS_COMPILE),)
+XML2CFG=$(shell which xml2-config)
+endif
 
-ifneq ($(OS),darwin)
-	LIBS += -lrt
+ifneq ($(XML2CFG),)
+	DEFS += $(shell $(XML2CFG) --cflags )
+	LIBS += $(shell $(XML2CFG) --libs)
+else
+	DEFS+=-I$(LOCALBASE)/include/libxml2 \
+		-I$(LOCALBASE)/include
+	LIBS+=-L$(LOCALBASE)/lib -lxml2
 endif
 
+DEFS+=-DOPENSER_MOD_INTERFACE
+
 SERLIBPATH=../../lib
 SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims
 
diff --git a/modules/ims_isc/checker.h b/modules/ims_isc/checker.h
index 60f640d..7ab6b26 100644
--- a/modules/ims_isc/checker.h
+++ b/modules/ims_isc/checker.h
@@ -46,6 +46,7 @@
 #ifndef _ISC_CHECKER_H
 #define _ISC_CHECKER_H
 
+#include <sys/types.h> /* for regex */
 #include <regex.h>
 #include "../../sr_module.h"
 #include "../../lib/ims/ims_getters.h"