[asterisk-commits] mjordan: trunk r386686 - /trunk/res/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Apr 26 16:52:09 CDT 2013


Author: mjordan
Date: Fri Apr 26 16:52:06 2013
New Revision: 386686

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386686
Log:
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)

Modified:
    trunk/res/res_sip_acl.c
    trunk/res/res_sip_dtmf_info.c
    trunk/res/res_sip_endpoint_identifier_constant.c
    trunk/res/res_sip_endpoint_identifier_ip.c
    trunk/res/res_sip_endpoint_identifier_user.c
    trunk/res/res_sip_logger.c
    trunk/res/res_sip_mwi.c
    trunk/res/res_sip_nat.c
    trunk/res/res_sip_outbound_authenticator_digest.c
    trunk/res/res_sip_outbound_registration.c
    trunk/res/res_sip_pubsub.c
    trunk/res/res_sip_registrar.c
    trunk/res/res_sip_rfc3326.c

Modified: trunk/res/res_sip_acl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_acl.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_acl.c (original)
+++ trunk/res/res_sip_acl.c Fri Apr 26 16:52:06 2013
@@ -18,6 +18,7 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_dtmf_info.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_dtmf_info.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_dtmf_info.c (original)
+++ trunk/res/res_sip_dtmf_info.c Fri Apr 26 16:52:06 2013
@@ -18,6 +18,8 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_sip</depend>
+	<depend>res_sip_session</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_endpoint_identifier_constant.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_endpoint_identifier_constant.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_endpoint_identifier_constant.c (original)
+++ trunk/res/res_sip_endpoint_identifier_constant.c Fri Apr 26 16:52:06 2013
@@ -20,6 +20,7 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<defaultenabled>no</defaultenabled>
 	<support_level>core</support_level>
  ***/

Modified: trunk/res/res_sip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_endpoint_identifier_ip.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_endpoint_identifier_ip.c (original)
+++ trunk/res/res_sip_endpoint_identifier_ip.c Fri Apr 26 16:52:06 2013
@@ -18,6 +18,7 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_endpoint_identifier_user.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_endpoint_identifier_user.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_endpoint_identifier_user.c (original)
+++ trunk/res/res_sip_endpoint_identifier_user.c Fri Apr 26 16:52:06 2013
@@ -18,6 +18,7 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_logger.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_logger.c (original)
+++ trunk/res/res_sip_logger.c Fri Apr 26 16:52:06 2013
@@ -18,6 +18,7 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_mwi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_mwi.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_mwi.c (original)
+++ trunk/res/res_sip_mwi.c Fri Apr 26 16:52:06 2013
@@ -15,6 +15,12 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
+
+/*** MODULEINFO
+	<depend>pjproject</depend>
+	<depend>res_sip</depend>
+	<support_level>core</support_level>
+ ***/
 
 #include "asterisk.h"
 

Modified: trunk/res/res_sip_nat.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_nat.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_nat.c (original)
+++ trunk/res/res_sip_nat.c Fri Apr 26 16:52:06 2013
@@ -17,6 +17,8 @@
  */
 
 /*** MODULEINFO
+	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_outbound_authenticator_digest.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_outbound_authenticator_digest.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_outbound_authenticator_digest.c (original)
+++ trunk/res/res_sip_outbound_authenticator_digest.c Fri Apr 26 16:52:06 2013
@@ -15,6 +15,12 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
+
+/*** MODULEINFO
+	<depend>pjproject</depend>
+	<depend>res_sip</depend>
+	<support_level>core</support_level>
+ ***/
 
 #include "asterisk.h"
 

Modified: trunk/res/res_sip_outbound_registration.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_outbound_registration.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_outbound_registration.c (original)
+++ trunk/res/res_sip_outbound_registration.c Fri Apr 26 16:52:06 2013
@@ -17,6 +17,8 @@
  */
 
 /*** MODULEINFO
+	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_pubsub.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_pubsub.c (original)
+++ trunk/res/res_sip_pubsub.c Fri Apr 26 16:52:06 2013
@@ -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>

Modified: trunk/res/res_sip_registrar.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_registrar.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_registrar.c (original)
+++ trunk/res/res_sip_registrar.c Fri Apr 26 16:52:06 2013
@@ -17,6 +17,8 @@
  */
 
 /*** MODULEINFO
+	<depend>pjproject</depend>
+	<depend>res_sip</depend>
 	<support_level>core</support_level>
  ***/
 

Modified: trunk/res/res_sip_rfc3326.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_rfc3326.c?view=diff&rev=386686&r1=386685&r2=386686
==============================================================================
--- trunk/res/res_sip_rfc3326.c (original)
+++ trunk/res/res_sip_rfc3326.c Fri Apr 26 16:52:06 2013
@@ -18,6 +18,8 @@
 
 /*** MODULEINFO
 	<depend>pjproject</depend>
+	<depend>res_sip</depend>
+	<depend>res_sip_session</depend>
 	<support_level>core</support_level>
  ***/
 




More information about the asterisk-commits mailing list