sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

app_python compilation warnings fix
by Konstantin M. 02 Dec '12

02 Dec '12

Hello dev team, I'm trying to compile app_python under kamailio 3.3.2 and gcc (Debian 4.7.2-4) 4.7.2 and I'm getting a bunch of warnings like: CC (gcc) [M app_python.so] python_exec.o CC (gcc) [M app_python.so] python_iface.o In file included from /usr/include/python2.7/Python.h:8:0, from python_iface.c:28: /usr/include/python2.7/pyconfig.h:1161:0: warning: "_POSIX_C_SOURCE" redefined [enabled by default] In file included from /usr/include/i386-linux-gnu/sys/types.h:26:0, from ../../route_struct.h:45, from ../../action.h:42, from python_iface.c:23: /usr/include/features.h:214:0: note: this is the location of the previous definition CC (gcc) [M app_python.so] python_mod.o In file included from /usr/include/python2.7/Python.h:8:0, from python_iface.h:26, from python_mod.c:27: /usr/include/python2.7/pyconfig.h:1161:0: warning: "_POSIX_C_SOURCE" redefined [enabled by default] In file included from /usr/include/dlfcn.h:23:0, from ../../sr_module.h:60, from python_mod.c:24: /usr/include/features.h:214:0: note: this is the location of the previous definition ... According to the Python documentation ( http://docs.python.org/c-api/intro.html#includes), the include directive for “Python.h” should appear first in the C/C++ file. It doesn’t sound like a good idea to require this, but if you don’t put “Python.h” first, you might get compiler warnings like I mentioned above. I've made a diff (against kamailio-3.3.2) for fixing that. See attached.

2 2

git:master: app_python: fix compiler warnings
by Ovidiu Sas 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: 6a45c8eba310afa9b8173c0522d77e7a574ddc52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a45c8e… Author: Konstantin M <evilzluk(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Dec 2 22:21:05 2012 -0500 app_python: fix compiler warnings - patch provided by "Konstantin M <evilzluk(a)gmail.com>" --- modules/app_python/python_iface.c | 4 ++-- modules/app_python/python_mod.c | 6 +++--- modules/app_python/python_msgobj.c | 9 +++------ modules/app_python/python_support.c | 6 +++--- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/modules/app_python/python_iface.c b/modules/app_python/python_iface.c index ecf692c..7e571d8 100644 --- a/modules/app_python/python_iface.c +++ b/modules/app_python/python_iface.c @@ -20,13 +20,13 @@ * */ +#include <Python.h> + #include "../../action.h" #include "../../dprint.h" #include "../../route_struct.h" #include "python_exec.h" -#include <Python.h> - /* Return the number of arguments of the application command line */ static PyObject* router_LM_ERR(PyObject *self, PyObject *args) diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index c178551..185bf99 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -20,6 +20,9 @@ * */ +#include <Python.h> +#include <libgen.h> + #include "../../str.h" #include "../../sr_module.h" @@ -28,9 +31,6 @@ #include "python_msgobj.h" #include "python_support.h" -#include <Python.h> -#include <libgen.h> - MODULE_VERSION static int mod_init(void); diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 3e4a2cd..3426b41 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -20,19 +20,16 @@ * */ +#include <Python.h> + #include "../../action.h" #include "../../mem/mem.h" #include "../../sr_module.h" #include "../../dset.h" #include "../../parser/msg_parser.h" -#include <Python.h> #include "structmember.h" -#ifndef Py_TYPE -#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) -#endif - typedef struct { PyObject_HEAD struct sip_msg *msg; @@ -526,7 +523,7 @@ static PyTypeObject MSGtype = { int python_msgobj_init(void) { - Py_TYPE((void*)(&MSGtype)) = &PyType_Type; + MSGtype.ob_type = &PyType_Type; if (PyType_Ready(&MSGtype) < 0) return -1; return 0; diff --git a/modules/app_python/python_support.c b/modules/app_python/python_support.c index 9c3cc2e..e0ac4eb 100644 --- a/modules/app_python/python_support.c +++ b/modules/app_python/python_support.c @@ -20,12 +20,12 @@ * */ +#include <Python.h> +#include <stdio.h> + #include "../../dprint.h" #include "python_mod.h" -#include <stdio.h> -#include <Python.h> - void python_handle_exception(const char *fname) {

1 0

git:master: lcr: fix cross-compilation
by Ovidiu Sas 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: 10fc575cc383093953d71c69e8d9a0065f33bdfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10fc575… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Dec 2 16:00:17 2012 -0500 lcr: fix cross-compilation --- modules/lcr/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/lcr/Makefile b/modules/lcr/Makefile index 6a37cc8..70d6400 100644 --- a/modules/lcr/Makefile +++ b/modules/lcr/Makefile @@ -8,20 +8,20 @@ include ../../Makefile.defs auto_gen= NAME=lcr.so +ifeq ($(CROSS_COMPILE),) BUILDER = $(shell which pcre-config) +endif ifeq ($(BUILDER),) - PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \ - -I/usr/sfw/include - PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \ - -L/opt/lib -lpcre + PCREDEFS=-I$(LOCALBASE)/include + PCRELIBS=-L$(LOCALBASE)/lib -lpcre else PCREDEFS = $(shell pcre-config --cflags) PCRELIBS = $(shell pcre-config --libs) endif DEFS+=$(PCREDEFS) -LIBS=$(PCRELIBS) +LIBS+=$(PCRELIBS) DEFS+=-DKAMAILIO_MOD_INTERFACE

1 0

git:master: auth: Documentation corrections
by Olle E. Johansson 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: 25600feab7d5d3b30420a05fd4c899f0bbbff667 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25600fe… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 2 21:24:13 2012 +0100 auth: Documentation corrections --- modules/auth/doc/auth.xml | 4 ++-- modules/auth/doc/functions.xml | 24 ++++++++++++------------ modules/auth/doc/params.xml | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/auth/doc/auth.xml b/modules/auth/doc/auth.xml index bf87b47..59cfd9e 100644 --- a/modules/auth/doc/auth.xml +++ b/modules/auth/doc/auth.xml @@ -51,10 +51,10 @@ authentication backends). </para> <para> - We decided to break the authentication code into several modules + We decided to divide the authentication code into several modules because there are now more than one backends (currently database authentication and radius are supported). This allows us to create - separate packages so uses can install and load only required + separate packages so users can install and load only the required functionality. This also allows us to avoid unnecessary dependencies in the binary packages. </para> diff --git a/modules/auth/doc/functions.xml b/modules/auth/doc/functions.xml index eee1f56..4140f8c 100644 --- a/modules/auth/doc/functions.xml +++ b/modules/auth/doc/functions.xml @@ -9,7 +9,7 @@ <section id="consume_credentials"> <title><function>consume_credentials()</function></title> <para> - This function removes previously authorized credentials from the + This function removes previously authorized credential headers from the message being processed by the server. That means that the downstream message will not contain credentials there were used by this server. This ensures that the proxy will not reveal @@ -73,7 +73,7 @@ if (has_credentials("myrealm")) { </para> <para> It must not be empty string <quote></quote>. In case of REGISTER - requests To header field domain (e.g., variable $td) can be used + requests, the To header field domain (e.g., variable $td) can be used (because this header field represents the user being registered), for all other messages From header field domain can be used (e.g., variable $fd). @@ -132,10 +132,10 @@ if (!www_authenticate("$td", "subscriber")) { put the header field into a response generated from the request the server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. - For more information regarding digest authentication see RFC2617. See module parameter force_stateless_reply - regarding sending of the reply. + For more information regarding digest authentication see RFC2617. + See module parameter force_stateless_reply regarding sending of the reply. </para> - <para>Meaning of the parameters the same as for function + <para>Meaning of the parameters is the same as for function www_challenge(realm, flags)</para> <para> This function can be used from REQUEST_ROUTE. @@ -160,7 +160,7 @@ if (!proxy_authenticate("$fd", "subscriber")) { The function challenges a user agent for authentication. It combines the functions www_challenge() and proxy_challenge(), by calling internally the first one for REGISTER requests and the second one for - the rest of the request types. + the rest of other request types. </para> <para>Meaning of the parameters the same as for function www_challenge(realm, flags)</para> @@ -168,7 +168,7 @@ if (!proxy_authenticate("$fd", "subscriber")) { This function can be used from REQUEST_ROUTE. </para> <example> - <title>proxy_challenge usage</title> + <title>auth_challenge usage</title> <programlisting format="linespecific"> ... if (!auth_check("$fd", "subscriber", "1")) { @@ -240,7 +240,7 @@ if (!auth_check("$fd", "subscriber", "1")) { </listitem> <listitem> <para><emphasis>passwd</emphasis> - the password to be used - for authentication. Can contain config variables. Username is + for authentication. Can contain config variables. The Username is taken from Auth header.</para> </listitem> <listitem> @@ -278,7 +278,7 @@ if (!auth_check("$fd", "subscriber", "1")) { </itemizedlist> <para> When challenge header is built and stored in avp, - append_to_reply() and sl reply functions can be used to send + append_to_reply() and the sl reply functions can be used to send appropriate SIP reply to challenge for authentication. </para> <para> @@ -356,7 +356,7 @@ if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { This function can be used from REQUEST_ROUTE. </para> <example> - <title>pv_proxy_authenticate usage</title> + <title>pv_auth_check usage</title> <programlisting format="linespecific"> ... $avp(password)="xyz"; @@ -370,10 +370,10 @@ if (!pv_auth_check("$fd", "$avp(password)", "0", "1")) { <section id="auth_get_www_authenticate"> <title> - <function moreinfo="none">auth_get_www_authenticate(realm, flags, pvdst)</function> + <function moreinfo="none">auth_get_www_authenticate(realm, flags, pvdest)</function> </title> <para> - Build WWW-Authentication header and set the resulting value in 'pvdest' parameter. + Build WWW-Authentication header and set the resulting value in 'pvdest' pseudo-variable parameter. </para> <para>Meaning of the realm and flags parameters is the same as for pv_www_authenticate(realm, passwd, flags)</para> diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index f9c1f8a..973f14e 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -13,8 +13,8 @@ <varname>auth_checks_in_dlg</varname> (flags) </title> <para> - These three module parameters control which optional integrity - checks will be performed on the SIP message carrying digest response + These three module parameters control which optional integrity + checks will be performed on the SIP message carrying digest response during digest authentication. <varname>auth_check_register</varname> controls integrity checks to be performed on REGISTER messages, <varname>auth_checks_no_dlg</varname> controls which optional

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Olle E. Johansson 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: 291df73af6f35526e4c43c1c7d8b8ea15e93aa64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=291df73… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 2 21:27:22 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: xcap_server: fix cross-compilation regex: fix cross-compilation pua_xmpp: fix cross-compilation pua_usrloc: fix cross-compilation pua_reginfo: fix cross-compilation pua_dialoginfo: fix cross-compilation pua_bla: fix cross-compilation pua: fix cross-compilation presence_xml: fix cross-compilation presence_reginfo: no need to link against libxml2 ---

1 0

git:master: auth: README update
by Olle E. Johansson 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: 9b67242978cb6aab702ccf4715e9152ac8f719c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b67242… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 2 21:26:54 2012 +0100 auth: README update --- modules/auth/README | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index a429a53..5a76ca6 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -50,7 +50,7 @@ Daniel-Constantin Mierla 1.4.6. pv_www_authenticate(realm, passwd, flags [, method]) 1.4.7. pv_proxy_authenticate(realm, passwd, flags) 1.4.8. pv_auth_check(realm, passwd, flags, checks) - 1.4.9. auth_get_www_authenticate(realm, flags, pvdst) + 1.4.9. auth_get_www_authenticate(realm, flags, pvdest) 1.1. Overview @@ -59,10 +59,10 @@ Daniel-Constantin Mierla all other authentication related modules (so called authentication backends). - We decided to break the authentication code into several modules + We decided to divide the authentication code into several modules because there are now more than one backends (currently database authentication and radius are supported). This allows us to create - separate packages so uses can install and load only required + separate packages so users can install and load only the required functionality. This also allows us to avoid unnecessary dependencies in the binary packages. @@ -540,7 +540,7 @@ modparam("auth", "use_domain", 1) 1.4.1. consume_credentials() - This function removes previously authorized credentials from the + This function removes previously authorized credential headers from the message being processed by the server. That means that the downstream message will not contain credentials there were used by this server. This ensures that the proxy will not reveal information about @@ -582,10 +582,11 @@ if (has_credentials("myrealm")) { * realm - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server is running on. - It must not be empty string "". In case of REGISTER requests To - header field domain (e.g., variable $td) can be used (because this - header field represents the user being registered), for all other - messages From header field domain can be used (e.g., variable $fd). + It must not be empty string "". In case of REGISTER requests, the + To header field domain (e.g., variable $td) can be used (because + this header field represents the user being registered), for all + other messages From header field domain can be used (e.g., variable + $fd). The string may contain pseudo variables. * flags - Value of this parameter can be a bitmask of following: + 1 - build challenge header with qop=auth @@ -614,8 +615,8 @@ if (!www_authenticate("$td", "subscriber")) { information regarding digest authentication see RFC2617. See module parameter force_stateless_reply regarding sending of the reply. - Meaning of the parameters the same as for function www_challenge(realm, - flags) + Meaning of the parameters is the same as for function + www_challenge(realm, flags) This function can be used from REQUEST_ROUTE. @@ -631,14 +632,14 @@ if (!proxy_authenticate("$fd", "subscriber")) { The function challenges a user agent for authentication. It combines the functions www_challenge() and proxy_challenge(), by calling internally the first one for REGISTER requests and the second one for - the rest of the request types. + the rest of other request types. Meaning of the parameters the same as for function www_challenge(realm, flags) This function can be used from REQUEST_ROUTE. - Example 20. proxy_challenge usage + Example 20. auth_challenge usage ... if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "1"); @@ -675,7 +676,7 @@ if (!auth_check("$fd", "subscriber", "1")) { messages From header field domain can be used (e.g., varibale $fd). The string may contain pseudo variables. * passwd - the password to be used for authentication. Can contain - config variables. Username is taken from Auth header. + config variables. The Username is taken from Auth header. * flags - the value of this parameter can be a bitmask of following: + 1 - the value of password parameter is HA1 format + 2 - build challenge header with no qop and add it to avp @@ -686,7 +687,7 @@ if (!auth_check("$fd", "subscriber", "1")) { is optional and if not set is the first "word" on the request-line. When challenge header is built and stored in avp, append_to_reply() and - sl reply functions can be used to send appropriate SIP reply to + the sl reply functions can be used to send appropriate SIP reply to challenge for authentication. This function can be used from REQUEST_ROUTE. @@ -738,7 +739,7 @@ if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { This function can be used from REQUEST_ROUTE. - Example 23. pv_proxy_authenticate usage + Example 23. pv_auth_check usage ... $avp(password)="xyz"; if (!pv_auth_check("$fd", "$avp(password)", "0", "1")) { @@ -746,10 +747,10 @@ if (!pv_auth_check("$fd", "$avp(password)", "0", "1")) { }; ... -1.4.9. auth_get_www_authenticate(realm, flags, pvdst) +1.4.9. auth_get_www_authenticate(realm, flags, pvdest) Build WWW-Authentication header and set the resulting value in 'pvdest' - parameter. + pseudo-variable parameter. Meaning of the realm and flags parameters is the same as for pv_www_authenticate(realm, passwd, flags)

1 0

git:master: xcap_server: fix cross-compilation
by Ovidiu Sas 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: e1faa0591c05482be95eb81016c37b9a5be57d14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1faa05… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Dec 2 15:09:24 2012 -0500 xcap_server: fix cross-compilation --- modules_k/xcap_server/Makefile | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules_k/xcap_server/Makefile b/modules_k/xcap_server/Makefile index 0f79ee9..62e3404 100644 --- a/modules_k/xcap_server/Makefile +++ b/modules_k/xcap_server/Makefile @@ -8,21 +8,17 @@ include ../../Makefile.defs auto_gen= NAME=xcap_server.so -LIBS= +ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +endif ifneq ($(XML2CFG),) - DEFS += $(shell $(XML2CFG) --cflags) LIBS += $(shell $(XML2CFG) --libs) - else - - DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include + DEFS+=-I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include LIBS+=-L$(LOCALBASE)/lib -lxml2 - endif DEFS+=-DKAMAILIO_MOD_INTERFACE

1 0

git:master: regex: fix cross-compilation
by Ovidiu Sas 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: 50f4cd86ccebab713c2b9895cdffbd619e84955e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50f4cd8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Dec 2 15:07:28 2012 -0500 regex: fix cross-compilation --- modules_k/regex/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/regex/Makefile b/modules_k/regex/Makefile index 97b80c4..947c14c 100644 --- a/modules_k/regex/Makefile +++ b/modules_k/regex/Makefile @@ -4,20 +4,20 @@ include ../../Makefile.defs auto_gen= NAME=regex.so +ifeq ($(CROSS_COMPILE),) BUILDER = $(shell which pcre-config) +endif ifeq ($(BUILDER),) - PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \ - -I/usr/sfw/include - PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \ - -L/opt/lib -lpcre + PCREDEFS=-I$(LOCALBASE)/include + PCRELIBS=-L$(LOCALBASE)/lib -lpcre else PCREDEFS = $(shell pcre-config --cflags) PCRELIBS = $(shell pcre-config --libs) endif DEFS+=$(PCREDEFS) -LIBS=$(PCRELIBS) +LIBS+=$(PCRELIBS) DEFS+=-DKAMAILIO_MOD_INTERFACE

1 0

git:master: pua_xmpp: fix cross-compilation
by Ovidiu Sas 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: beb3425e309b0f7d1b2bccee942c35f541a2dd7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=beb3425… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Dec 2 14:53:44 2012 -0500 pua_xmpp: fix cross-compilation --- modules_k/pua_xmpp/Makefile | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules_k/pua_xmpp/Makefile b/modules_k/pua_xmpp/Makefile index fc5f7b3..2db0f59 100644 --- a/modules_k/pua_xmpp/Makefile +++ b/modules_k/pua_xmpp/Makefile @@ -6,8 +6,17 @@ auto_gen= NAME= pua_xmpp.so LIBS= -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -LIBS+=-L$(LOCALBASE)/lib -lxml2 +ifeq ($(CROSS_COMPILE),) +XML2CFG=$(shell which xml2-config) +endif + +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+=-DKAMAILIO_MOD_INTERFACE

1 0

git:master: pua_usrloc: fix cross-compilation
by Ovidiu Sas 02 Dec '12

02 Dec '12

Module: sip-router Branch: master Commit: c9d7fc58a19afdeb77fb3b496068d3f79ef95c67 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9d7fc5… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sun Dec 2 14:52:16 2012 -0500 pua_usrloc: fix cross-compilation --- modules_k/pua_usrloc/Makefile | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules_k/pua_usrloc/Makefile b/modules_k/pua_usrloc/Makefile index 5e53345..70af784 100644 --- a/modules_k/pua_usrloc/Makefile +++ b/modules_k/pua_usrloc/Makefile @@ -6,9 +6,17 @@ auto_gen= NAME=pua_usrloc.so LIBS= -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include -LIBS+=-L$(LOCALBASE)/lib -lxml2 +ifeq ($(CROSS_COMPILE),) +XML2CFG=$(shell which xml2-config) +endif + +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+=-DKAMAILIO_MOD_INTERFACE

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012