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

diff --git a/res/res_sip_acl.c b/res/res_sip_acl.c
index 405c3c1bc021beb41dc191ad1ed81cd132256c73..07e4d76e5e5fd09516eb1191c1c98effe206fe1d 100644 (file)
--- 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 453e57d06163f7ea22e2de8bc7e12d4c16ba8e37..c8b03d5098823b6a2025a14fd3feb27e8d54ba2f 100644 (file)
--- 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 e519a9ee8eec691f59474f19a0294330bcea8567..212cca263a0f97ecf5d88508afc23406b37825f2 100644 (file)
--- 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 49c70b59de91dfb92e58b1918fc5ea4bc088d08d..e3630ad072ccc46970cfd26ee750cc2b84a4c694 100644 (file)
--- 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 cd1f76bb1ef0a71e2e58a7ffba597cba298954bc..86d3d3b8622f96d49a36d17c141fc17baf47626c 100644 (file)
--- 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 da17198100ad0f46a4c4ef841fab9a8314255f15..663572e1e40c2c3d790542700d9f046c46cece9f 100644 (file)
--- 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 7d62816d079ff6225dd96ea6e6c58827a3d88d42..588662f339869052a78004d9a1bf09428da7ed63 100644 (file)
--- 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 6c924af68e62170c39878370cc07d6a09087a650..02c60a14e4bfe1194abe6932ccebf4866be747e6 100644 (file)
--- 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 180c05e277a1542c1e42923eaf8355aff0b1f700..d4ce7d66a683a0e0e550c37efe4ec9bd266c309c 100644 (file)
--- 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 8f1108df55debd70e48ea43d5ecb6f4b39268a79..2ef92cdc097d163caa7ad3310d12ac2f9dc8985f 100644 (file)
--- 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 2983d563e539aee7ad63183fae6b6d41775ea000..c8a76a602bd2a97ac49e1fccaae5e87a1d5e5feb 100644 (file)
--- 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 e5a2e888bef0323814b1bf8939a6a1829e41ec75..0cc5821ee0a9c98961f408563836ca80a284b1ae 100644 (file)
--- 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 1c9ec6154eb1f5208651f1077113322b80660ae1..f6bb8533ed1f15e3e0b86089c02100e29c9deba8 100644 (file)
--- 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>
  ***/