From c5f1eecb15d312d4286c00d22c00416824e0289a Mon Sep 17 00:00:00 2001 From: Matthew Jordan <mjordan@digium.com> Date: Fri, 26 Apr 2013 21:52:06 +0000 Subject: [PATCH] Add missing module dependencies to various res_sip* modules This patch updates the various res_sip modules with their proper menuselect options and proper dependencies, such that Asterisk still has a snowball's chance in hell of compiling without pjproject. Much thanks to snuffy(-home|-work) for making everyone's life easier with this patch. Review: https://reviewboard.asterisk.org/r/2472/ (closes issue ASTERISK-21669) Reported by: snuffy patches: xml-depends.diff uploaded by snuffy (license 5024) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@386686 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_sip_acl.c | 1 + res/res_sip_dtmf_info.c | 2 ++ res/res_sip_endpoint_identifier_constant.c | 1 + res/res_sip_endpoint_identifier_ip.c | 1 + res/res_sip_endpoint_identifier_user.c | 1 + res/res_sip_logger.c | 1 + res/res_sip_mwi.c | 6 ++++++ res/res_sip_nat.c | 2 ++ res/res_sip_outbound_authenticator_digest.c | 6 ++++++ res/res_sip_outbound_registration.c | 2 ++ res/res_sip_pubsub.c | 6 ++++++ res/res_sip_registrar.c | 2 ++ res/res_sip_rfc3326.c | 2 ++ 13 files changed, 33 insertions(+) diff --git a/res/res_sip_acl.c b/res/res_sip_acl.c index 405c3c1bc0..07e4d76e5e 100644 --- a/res/res_sip_acl.c +++ b/res/res_sip_acl.c @@ -18,6 +18,7 @@ /*** MODULEINFO <depend>pjproject</depend> + <depend>res_sip</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_dtmf_info.c b/res/res_sip_dtmf_info.c index 453e57d061..c8b03d5098 100644 --- a/res/res_sip_dtmf_info.c +++ b/res/res_sip_dtmf_info.c @@ -18,6 +18,8 @@ /*** MODULEINFO <depend>pjproject</depend> + <depend>res_sip</depend> + <depend>res_sip_session</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_endpoint_identifier_constant.c b/res/res_sip_endpoint_identifier_constant.c index e519a9ee8e..212cca263a 100644 --- a/res/res_sip_endpoint_identifier_constant.c +++ b/res/res_sip_endpoint_identifier_constant.c @@ -20,6 +20,7 @@ /*** MODULEINFO <depend>pjproject</depend> + <depend>res_sip</depend> <defaultenabled>no</defaultenabled> <support_level>core</support_level> ***/ diff --git a/res/res_sip_endpoint_identifier_ip.c b/res/res_sip_endpoint_identifier_ip.c index 49c70b59de..e3630ad072 100644 --- a/res/res_sip_endpoint_identifier_ip.c +++ b/res/res_sip_endpoint_identifier_ip.c @@ -18,6 +18,7 @@ /*** MODULEINFO <depend>pjproject</depend> + <depend>res_sip</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_endpoint_identifier_user.c b/res/res_sip_endpoint_identifier_user.c index cd1f76bb1e..86d3d3b862 100644 --- a/res/res_sip_endpoint_identifier_user.c +++ b/res/res_sip_endpoint_identifier_user.c @@ -18,6 +18,7 @@ /*** MODULEINFO <depend>pjproject</depend> + <depend>res_sip</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_logger.c b/res/res_sip_logger.c index da17198100..663572e1e4 100644 --- a/res/res_sip_logger.c +++ b/res/res_sip_logger.c @@ -18,6 +18,7 @@ /*** MODULEINFO <depend>pjproject</depend> + <depend>res_sip</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_mwi.c b/res/res_sip_mwi.c index 7d62816d07..588662f339 100644 --- a/res/res_sip_mwi.c +++ b/res/res_sip_mwi.c @@ -16,6 +16,12 @@ * at the top of the source tree. */ +/*** MODULEINFO + <depend>pjproject</depend> + <depend>res_sip</depend> + <support_level>core</support_level> + ***/ + #include "asterisk.h" #include <pjsip.h> diff --git a/res/res_sip_nat.c b/res/res_sip_nat.c index 6c924af68e..02c60a14e4 100644 --- a/res/res_sip_nat.c +++ b/res/res_sip_nat.c @@ -17,6 +17,8 @@ */ /*** MODULEINFO + <depend>pjproject</depend> + <depend>res_sip</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_outbound_authenticator_digest.c b/res/res_sip_outbound_authenticator_digest.c index 180c05e277..d4ce7d66a6 100644 --- a/res/res_sip_outbound_authenticator_digest.c +++ b/res/res_sip_outbound_authenticator_digest.c @@ -16,6 +16,12 @@ * at the top of the source tree. */ +/*** MODULEINFO + <depend>pjproject</depend> + <depend>res_sip</depend> + <support_level>core</support_level> + ***/ + #include "asterisk.h" #include <pjsip.h> diff --git a/res/res_sip_outbound_registration.c b/res/res_sip_outbound_registration.c index 8f1108df55..2ef92cdc09 100644 --- a/res/res_sip_outbound_registration.c +++ b/res/res_sip_outbound_registration.c @@ -17,6 +17,8 @@ */ /*** MODULEINFO + <depend>pjproject</depend> + <depend>res_sip</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_pubsub.c b/res/res_sip_pubsub.c index 2983d563e5..c8a76a602b 100644 --- a/res/res_sip_pubsub.c +++ b/res/res_sip_pubsub.c @@ -19,6 +19,12 @@ * \brief Opaque structure representing an RFC 3265 SIP subscription */ +/*** MODULEINFO + <depend>pjproject</depend> + <depend>res_sip</depend> + <support_level>core</support_level> + ***/ + #include "asterisk.h" #include <pjsip.h> diff --git a/res/res_sip_registrar.c b/res/res_sip_registrar.c index e5a2e888be..0cc5821ee0 100644 --- a/res/res_sip_registrar.c +++ b/res/res_sip_registrar.c @@ -17,6 +17,8 @@ */ /*** MODULEINFO + <depend>pjproject</depend> + <depend>res_sip</depend> <support_level>core</support_level> ***/ diff --git a/res/res_sip_rfc3326.c b/res/res_sip_rfc3326.c index 1c9ec6154e..f6bb8533ed 100644 --- a/res/res_sip_rfc3326.c +++ b/res/res_sip_rfc3326.c @@ -18,6 +18,8 @@ /*** MODULEINFO <depend>pjproject</depend> + <depend>res_sip</depend> + <depend>res_sip_session</depend> <support_level>core</support_level> ***/ -- GitLab