diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-05 22:11:40 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-05 22:11:40 +0000 |
| commit | 357b97fb29d196a5f336d6a2879278ea135ab08c (patch) | |
| tree | 5fcf1b4296a6396cbbbb82737d64e51eafd88449 /channels | |
| parent | 6950abbd374b18cd85acbbcd3596b4e9da6bd98d (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@326412 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 8 | ||||
| -rw-r--r-- | channels/chan_gtalk.c | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 2 | ||||
| -rw-r--r-- | channels/chan_jingle.c | 2 | ||||
| -rw-r--r-- | channels/chan_mgcp.c | 2 | ||||
| -rw-r--r-- | channels/chan_sip.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 3a0260fbd..321be6625 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 d8dd736e4..3b08d8ce4 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 f3a097e7d..9f5f32deb 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 d0a027c3d..53b1a85e4 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 293a2c1fe..bd92fe9b0 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 3981425e9..18eba2371 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> ***/ |