[sr-dev] git:master: xcap_server: use xml2-config to get include and libs compile flags

Daniel-Constantin Mierla miconda at gmail.com
Fri Sep 9 10:26:05 CEST 2011


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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Fri Sep  9 10:08:33 2011 +0200

xcap_server: use xml2-config to get include and libs compile flags

---

 modules_k/xcap_server/Makefile |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules_k/xcap_server/Makefile b/modules_k/xcap_server/Makefile
index 660341e..600686e 100644
--- a/modules_k/xcap_server/Makefile
+++ b/modules_k/xcap_server/Makefile
@@ -10,9 +10,20 @@ auto_gen=
 NAME=xcap_server.so
 LIBS=
 
-DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \
-      -I$(LOCALBASE)/include
-LIBS+=-L$(LOCALBASE)/lib -lxml2
+XML2CFG=$(shell which xml2-config)
+
+ifneq ($(XML2CFG),)
+
+	DEFS += $(shell $(XML2CFG) --cflags)
+	LIBS += $(shell $(XML2CFG) --libs)
+
+else
+
+	DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \
+		-I$(LOCALBASE)/include
+	LIBS+=-L$(LOCALBASE)/lib -lxml2
+
+endif
 
 DEFS+=-DOPENSER_MOD_INTERFACE
 




More information about the sr-dev mailing list