diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-07-05 22:11:40 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-07-05 22:11:40 +0000 |
commit | 7d179abfd427f81c2d49efd4ecc6ac02fba8934a (patch) | |
tree | 5fcf1b4296a6396cbbbb82737d64e51eafd88449 /funcs | |
parent | 84686384fcabb14775d7650472c0297b9b071e3d (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: https://origsvn.digium.com/svn/asterisk/trunk@326412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs')
-rw-r--r-- | funcs/func_aes.c | 2 | ||||
-rw-r--r-- | funcs/func_speex.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/funcs/func_aes.c b/funcs/func_aes.c index 64597a9b4..891106b6f 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 51cea99e1..e17e8ca9c 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" |