[sr-dev] git:master: ims modules: don't link with -lrt on macosx

Daniel-Constantin Mierla miconda at gmail.com
Wed Jan 2 14:40:51 CET 2013


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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Wed Jan  2 14:38:22 2013 +0100

ims modules: don't link with -lrt on macosx

- define MAXINT on mac os x

---

 modules/icscf/Makefile           |    6 +++++-
 modules/icscf/scscf_list.h       |    9 ++++++++-
 modules/isc/Makefile             |    6 +++++-
 modules/registrar_pcscf/Makefile |    6 +++++-
 modules/registrar_scscf/Makefile |    6 +++++-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/modules/icscf/Makefile b/modules/icscf/Makefile
index a94dd9c..0c2e907 100644
--- a/modules/icscf/Makefile
+++ b/modules/icscf/Makefile
@@ -13,7 +13,11 @@ LIBS=
 DEFS += -DOPENSER_MOD_INTERFACE
 
 DEFS += -I/usr/include/libxml2
-LIBS += -L$(LOCALBASE)/lib -lxml2 -lrt
+LIBS += -L$(LOCALBASE)/lib -lxml2
+
+ifneq ($(OS),darwin)
+	LIBS += -lrt
+endif
 
 
 SERLIBPATH=../../lib
diff --git a/modules/icscf/scscf_list.h b/modules/icscf/scscf_list.h
index 2911c28..181caee 100644
--- a/modules/icscf/scscf_list.h
+++ b/modules/icscf/scscf_list.h
@@ -49,14 +49,21 @@
 #include "../../sr_module.h"
 #include "../../modules/tm/tm_load.h"
 #include "mod.h"
+#ifndef __OS_darwin
 #include <values.h>
-
+#endif
 #include "../../mem/shm_mem.h"
 
 #include "../../dset.h"
 
 #include "../../timer.h"
 
+#ifdef __OS_darwin
+#ifndef MAXINT
+#define MAXINT INT_MAX
+#endif
+#endif
+
 
 /** S-CSCF list element */ 
 typedef struct _scscf_entry {
diff --git a/modules/isc/Makefile b/modules/isc/Makefile
index 4c8bd32..4f66fbf 100644
--- a/modules/isc/Makefile
+++ b/modules/isc/Makefile
@@ -12,7 +12,11 @@ LIBS=
 DEFS += -DOPENSER_MOD_INTERFACE
 
 DEFS += -I/usr/include/libxml2
-LIBS += -L$(LOCALBASE)/lib -lxml2 -lrt
+LIBS += -L$(LOCALBASE)/lib -lxml2
+
+ifneq ($(OS),darwin)
+	LIBS += -lrt
+endif
 
 SERLIBPATH=../../lib
 SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims
diff --git a/modules/registrar_pcscf/Makefile b/modules/registrar_pcscf/Makefile
index 54d3100..9169f87 100644
--- a/modules/registrar_pcscf/Makefile
+++ b/modules/registrar_pcscf/Makefile
@@ -12,7 +12,11 @@ LIBS=
 
 DEFS+=-DOPENSER_MOD_INTERFACE -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2
 
-LIBS += -L$(LOCALBASE)/lib -lrt
+LIBS += -L$(LOCALBASE)/lib
+
+ifneq ($(OS),darwin)
+	LIBS += -lrt
+endif
 
 SERLIBPATH=../../lib
 SER_LIBS+=$(SERLIBPATH)/kcore/kcore
diff --git a/modules/registrar_scscf/Makefile b/modules/registrar_scscf/Makefile
index 651f3e6..f2c046a 100644
--- a/modules/registrar_scscf/Makefile
+++ b/modules/registrar_scscf/Makefile
@@ -12,7 +12,11 @@ LIBS=
 
 DEFS+=-DOPENSER_MOD_INTERFACE
 DEFS += -I/usr/include/libxml2 
-LIBS += -L$(LOCALBASE)/lib -lxml2 -lrt
+LIBS += -L$(LOCALBASE)/lib -lxml2
+
+ifneq ($(OS),darwin)
+	LIBS += -lrt
+endif
 
 SERLIBPATH=../../lib
 SER_LIBS+=$(SERLIBPATH)/kcore/kcore




More information about the sr-dev mailing list