From: Alexander Traud Date: Fri, 17 Apr 2020 09:47:01 +0000 (+0200) Subject: res_pjsip: Sync load- and build-time deps. X-Git-Tag: 17.4.0-rc1~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71c70dfbfbc19a569ef3cf464fd96311dcd7f773;p=thirdparty%2Fasterisk.git res_pjsip: Sync load- and build-time deps. MODULEINFO is checked while buidling/linking the module. AST_MODULE_INFO is checked while loading/running the module. ASTERISK-28838 Change-Id: I4bb868532ca217fec1351885d99eb55c21b58042 --- diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c index 43bf1783f7..0b166650ef 100644 --- a/res/res_pjsip_caller_id.c +++ b/res/res_pjsip_caller_id.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/ @@ -794,5 +795,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Caller ID Suppo .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_APP_DEPEND, - .requires = "res_pjsip", + .requires = "res_pjsip,res_pjsip_session", ); diff --git a/res/res_pjsip_diversion.c b/res/res_pjsip_diversion.c index 04f5964404..96a9069d5b 100644 --- a/res/res_pjsip_diversion.c +++ b/res/res_pjsip_diversion.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/ diff --git a/res/res_pjsip_dlg_options.c b/res/res_pjsip_dlg_options.c index 93e3f228e8..5c1da53583 100644 --- a/res/res_pjsip_dlg_options.c +++ b/res/res_pjsip_dlg_options.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/ @@ -99,5 +100,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SIP OPTIONS in dialog .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_APP_DEPEND, - .requires = "res_pjsip", + .requires = "res_pjsip,res_pjsip_session", ); diff --git a/res/res_pjsip_dtmf_info.c b/res/res_pjsip_dtmf_info.c index 983498def0..3d1223d001 100644 --- a/res/res_pjsip_dtmf_info.c +++ b/res/res_pjsip_dtmf_info.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/ diff --git a/res/res_pjsip_empty_info.c b/res/res_pjsip_empty_info.c index 74e5729a54..91b031dc8e 100644 --- a/res/res_pjsip_empty_info.c +++ b/res/res_pjsip_empty_info.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/ diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c index 68bd761588..7acde2bdc6 100644 --- a/res/res_pjsip_messaging.c +++ b/res/res_pjsip_messaging.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/ diff --git a/res/res_pjsip_one_touch_record_info.c b/res/res_pjsip_one_touch_record_info.c index 50f2a38321..9ab720f1d0 100644 --- a/res/res_pjsip_one_touch_record_info.c +++ b/res/res_pjsip_one_touch_record_info.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/ diff --git a/res/res_pjsip_rfc3326.c b/res/res_pjsip_rfc3326.c index 293c3dbe84..6a02641926 100644 --- a/res/res_pjsip_rfc3326.c +++ b/res/res_pjsip_rfc3326.c @@ -19,6 +19,7 @@ /*** MODULEINFO pjproject res_pjsip + res_pjsip_session core ***/