From 7d179abfd427f81c2d49efd4ecc6ac02fba8934a Mon Sep 17 00:00:00 2001 From: Tilghman Lesher <tilghman@meg.abyt.es> Date: Tue, 5 Jul 2011 22:11:40 +0000 Subject: [PATCH] Merged revisions 326411 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r326411 | tilghman | 2011-07-05 17:08:29 -0500 (Tue, 05 Jul 2011) | 14 lines Add the attribute "type" to each "<use>" for menuselect. This matters only when autoconf fails to detect that weak linking is supported. External optional dependencies will become optional in both cases, as they are removed at compile time when not detected. However, runtime-optional modules are made mandatory when weak linking is not found. This change affects only the external optional dependencies; previously, they were incorrectly required when weak linking support was not detected. Patches: 20110702__issue18062__asterisk_trunk.diff.txt by tilghman (License #5003) Tested by: iasgoscouk ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@326412 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 2 +- apps/app_stack.c | 2 +- apps/app_voicemail.c | 6 +++--- channels/chan_dahdi.c | 8 ++++---- channels/chan_gtalk.c | 2 +- channels/chan_iax2.c | 2 +- channels/chan_jingle.c | 2 +- channels/chan_mgcp.c | 2 +- channels/chan_sip.c | 2 +- codecs/codec_speex.c | 2 +- funcs/func_aes.c | 2 +- funcs/func_speex.c | 2 +- pbx/pbx_dundi.c | 2 +- res/res_jabber.c | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index e45ea91697..9442ce6495 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -57,7 +57,7 @@ */ /*** MODULEINFO - <use>res_monitor</use> + <use type="module">res_monitor</use> ***/ #include "asterisk.h" diff --git a/apps/app_stack.c b/apps/app_stack.c index 29c37a20b0..10a1af48d1 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -26,7 +26,7 @@ */ /*** MODULEINFO - <use>res_agi</use> + <use type="module">res_agi</use> ***/ #include "asterisk.h" diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 5e342bda08..971e1879d0 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -38,8 +38,8 @@ */ /*** MODULEINFO - <use>res_adsi</use> - <use>res_smdi</use> + <use type="module">res_adsi</use> + <use type="module">res_smdi</use> ***/ /*** MAKEOPTS @@ -60,7 +60,7 @@ <depend>imap_tk</depend> <conflict>ODBC_STORAGE</conflict> <conflict>FILE_STORAGE</conflict> - <use>openssl</use> + <use type="external">openssl</use> <defaultenabled>no</defaultenabled> </member> </category> diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 3a0260fbdf..321be66258 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -38,12 +38,12 @@ */ /*** MODULEINFO - <use>res_smdi</use> + <use type="module">res_smdi</use> <depend>dahdi</depend> <depend>tonezone</depend> - <use>pri</use> - <use>ss7</use> - <use>openr2</use> + <use type="external">pri</use> + <use type="external">ss7</use> + <use type="external">openr2</use> ***/ #include "asterisk.h" diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index d8dd736e40..3b08d8ce4e 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -34,7 +34,7 @@ /*** MODULEINFO <depend>iksemel</depend> <depend>res_jabber</depend> - <use>openssl</use> + <use type="external">openssl</use> ***/ #include "asterisk.h" diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index f3a097e7d0..9f5f32deb6 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -32,7 +32,7 @@ */ /*** MODULEINFO - <use>crypto</use> + <use type="external">crypto</use> ***/ #include "asterisk.h" diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index d0a027c3de..53b1a85e40 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -30,7 +30,7 @@ /*** MODULEINFO <depend>iksemel</depend> <depend>res_jabber</depend> - <use>openssl</use> + <use type="external">openssl</use> ***/ #include "asterisk.h" diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 293a2c1feb..bd92fe9b0e 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -30,7 +30,7 @@ */ /*** MODULEINFO - <use>res_pktccops</use> + <use type="module">res_pktccops</use> ***/ #include "asterisk.h" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3981425e90..18eba23712 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -162,7 +162,7 @@ */ /*** MODULEINFO - <use>res_crypto</use> + <use type="module">res_crypto</use> <depend>chan_local</depend> ***/ diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index d48e21f28d..6554ee000a 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -33,7 +33,7 @@ /*** MODULEINFO <depend>speex</depend> <depend>speex_preprocess</depend> - <use>speexdsp</use> + <use type="external">speexdsp</use> ***/ #include "asterisk.h" diff --git a/funcs/func_aes.c b/funcs/func_aes.c index 64597a9b41..891106b6f3 100644 --- a/funcs/func_aes.c +++ b/funcs/func_aes.c @@ -23,7 +23,7 @@ */ /*** MODULEINFO - <use>crypto</use> + <use type="external">crypto</use> ***/ #include "asterisk.h" diff --git a/funcs/func_speex.c b/funcs/func_speex.c index 51cea99e1d..e17e8ca9c0 100644 --- a/funcs/func_speex.c +++ b/funcs/func_speex.c @@ -33,7 +33,7 @@ /*** MODULEINFO <depend>speex</depend> <depend>speex_preprocess</depend> - <use>speexdsp</use> + <use type="external">speexdsp</use> ***/ #include "asterisk.h" diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 4c52d9d7c0..26418d760e 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -23,7 +23,7 @@ /*** MODULEINFO <depend>zlib</depend> - <use>crypto</use> + <use type="external">crypto</use> ***/ #include "asterisk.h" diff --git a/res/res_jabber.c b/res/res_jabber.c index 2d0ffcb3a2..61d436a924 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -32,7 +32,7 @@ /*** MODULEINFO <depend>iksemel</depend> - <use>openssl</use> + <use type="external">openssl</use> ***/ #include "asterisk.h" -- GitLab