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/branches/1.8@326411 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 66de657947fd0055f8e1016e36949e3869138c48..e22dfa4652f535486cb2acccb200ccaa52e00838 100644 (file)
--- 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 29c37a20b078acb32c3705fdbdbf030dd94015fb..10a1af48d160416f5e6aa58ea86fd1da9722474f 100644 (file)
--- 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 7a5dff564c2cc7c6c31d950c2e46f13b6ee168b0..f9f940ad26fd32be894cfd16563d08f30570bc5e 100644 (file)
--- 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 be17e1d324b04b19bada8adbeeb9055efcfe57cd..2d46eecfd31dd38f8b9e83942556776e758b90e0 100644 (file)
--- 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 a4a8683f2c15334e0816e70105d88fb713992585..1fbf561a3c7fd82909ad0d091b9088e26cd3998a 100644 (file)
--- 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>
  ***/
 
 

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 3505dc18e9d49de2410aefb28d11325093767d92..17ae3efd10cee62aa9f808959e44b22af4dd4530 100644 (file)
--- 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 557da7528ce7a52697ca471632dfbbbdcb91cb3c..b84aeaaa05c2c0c993f670a86a35a99816e3c0e6 100644 (file)
--- 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 73efd20472bc1984033f59e8bd01ec8232b683dc..22cca5e631bb5a34b12f9b9dba73cd1b9359a512 100644 (file)
--- 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 d273e0913d7de34e217db32d02fadc8cdbec6f17..7215bd92c805a5a334ded6a6d964e9d9afdc02a2 100644 (file)
--- 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 2bfdec228163675e26c32c936744116b01030f29..5236c79935ed1e00714020b1757c6ca1208a2734 100644 (file)
--- 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 64597a9b41ea9af98736cc52b6ec108bd736d612..891106b6f32ec049b0e9830227d4ae2690bf5fc2 100644 (file)
--- 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 4b8b3a3d6a3b152d5aa8f3ec0573f174cfc1efaf..e7595bda85dff65ff7400e91dd1fca51e14c8bf1 100644 (file)
--- 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 9b95b805874da6587611182c14ff8f6bae0303d8..c0b7c0178311007f8623fc59faa51610b49dc586 100644 (file)
--- 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 0968d81844c6999811168075d31ca285e4154127..7e83d813f8426290a6155433694a4ffb48209e7d 100644 (file)
--- 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"