Преглед на файлове

ims_isc: fix cross-compilation

Ovidiu Sas преди 12 години
родител
ревизия
7b483c4cd9
променени са 2 файла, в които са добавени 13 реда и са изтрити 7 реда
  1. 12 7
      modules/ims_isc/Makefile
  2. 1 0
      modules/ims_isc/checker.h

+ 12 - 7
modules/ims_isc/Makefile

@@ -7,17 +7,22 @@
 include ../../Makefile.defs
 include ../../Makefile.defs
 auto_gen=
 auto_gen=
 NAME=ims_isc.so
 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
 endif
 
 
+DEFS+=-DOPENSER_MOD_INTERFACE
+
 SERLIBPATH=../../lib
 SERLIBPATH=../../lib
 SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims
 SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims
 
 

+ 1 - 0
modules/ims_isc/checker.h

@@ -46,6 +46,7 @@
 #ifndef _ISC_CHECKER_H
 #ifndef _ISC_CHECKER_H
 #define _ISC_CHECKER_H
 #define _ISC_CHECKER_H
 
 
+#include <sys/types.h> /* for regex */
 #include <regex.h>
 #include <regex.h>
 #include "../../sr_module.h"
 #include "../../sr_module.h"
 #include "../../lib/ims/ims_getters.h"
 #include "../../lib/ims/ims_getters.h"