[asterisk-commits] tilghman: branch 1.8 r326411 - in /branches/1.8: apps/ channels/ codecs/ func...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jul 5 17:08:35 CDT 2011
Author: tilghman
Date: Tue Jul 5 17:08:29 2011
New Revision: 326411
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=326411
Log:
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
Modified:
branches/1.8/apps/app_queue.c
branches/1.8/apps/app_stack.c
branches/1.8/apps/app_voicemail.c
branches/1.8/channels/chan_dahdi.c
branches/1.8/channels/chan_gtalk.c
branches/1.8/channels/chan_iax2.c
branches/1.8/channels/chan_jingle.c
branches/1.8/channels/chan_mgcp.c
branches/1.8/channels/chan_sip.c
branches/1.8/codecs/codec_speex.c
branches/1.8/funcs/func_aes.c
branches/1.8/funcs/func_speex.c
branches/1.8/pbx/pbx_dundi.c
branches/1.8/res/res_jabber.c
Modified: branches/1.8/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_queue.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/apps/app_queue.c (original)
+++ branches/1.8/apps/app_queue.c Tue Jul 5 17:08:29 2011
@@ -57,7 +57,7 @@
*/
/*** MODULEINFO
- <use>res_monitor</use>
+ <use type="module">res_monitor</use>
***/
#include "asterisk.h"
Modified: branches/1.8/apps/app_stack.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_stack.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/apps/app_stack.c (original)
+++ branches/1.8/apps/app_stack.c Tue Jul 5 17:08:29 2011
@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
- <use>res_agi</use>
+ <use type="module">res_agi</use>
***/
#include "asterisk.h"
Modified: branches/1.8/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_voicemail.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/apps/app_voicemail.c (original)
+++ branches/1.8/apps/app_voicemail.c Tue Jul 5 17:08:29 2011
@@ -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>
Modified: branches/1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_dahdi.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/channels/chan_dahdi.c (original)
+++ branches/1.8/channels/chan_dahdi.c Tue Jul 5 17:08:29 2011
@@ -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"
Modified: branches/1.8/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_gtalk.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/channels/chan_gtalk.c (original)
+++ branches/1.8/channels/chan_gtalk.c Tue Jul 5 17:08:29 2011
@@ -34,7 +34,7 @@
/*** MODULEINFO
<depend>iksemel</depend>
<depend>res_jabber</depend>
- <use>openssl</use>
+ <use type="external">openssl</use>
***/
Modified: branches/1.8/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_iax2.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/channels/chan_iax2.c (original)
+++ branches/1.8/channels/chan_iax2.c Tue Jul 5 17:08:29 2011
@@ -32,7 +32,7 @@
*/
/*** MODULEINFO
- <use>crypto</use>
+ <use type="external">crypto</use>
***/
#include "asterisk.h"
Modified: branches/1.8/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_jingle.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/channels/chan_jingle.c (original)
+++ branches/1.8/channels/chan_jingle.c Tue Jul 5 17:08:29 2011
@@ -30,7 +30,7 @@
/*** MODULEINFO
<depend>iksemel</depend>
<depend>res_jabber</depend>
- <use>openssl</use>
+ <use type="external">openssl</use>
***/
#include "asterisk.h"
Modified: branches/1.8/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_mgcp.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/channels/chan_mgcp.c (original)
+++ branches/1.8/channels/chan_mgcp.c Tue Jul 5 17:08:29 2011
@@ -30,7 +30,7 @@
*/
/*** MODULEINFO
- <use>res_pktccops</use>
+ <use type="module">res_pktccops</use>
***/
#include "asterisk.h"
Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Tue Jul 5 17:08:29 2011
@@ -162,7 +162,7 @@
*/
/*** MODULEINFO
- <use>res_crypto</use>
+ <use type="module">res_crypto</use>
<depend>chan_local</depend>
***/
Modified: branches/1.8/codecs/codec_speex.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/codecs/codec_speex.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/codecs/codec_speex.c (original)
+++ branches/1.8/codecs/codec_speex.c Tue Jul 5 17:08:29 2011
@@ -33,7 +33,7 @@
/*** MODULEINFO
<depend>speex</depend>
<depend>speex_preprocess</depend>
- <use>speexdsp</use>
+ <use type="external">speexdsp</use>
***/
#include "asterisk.h"
Modified: branches/1.8/funcs/func_aes.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/funcs/func_aes.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/funcs/func_aes.c (original)
+++ branches/1.8/funcs/func_aes.c Tue Jul 5 17:08:29 2011
@@ -23,7 +23,7 @@
*/
/*** MODULEINFO
- <use>crypto</use>
+ <use type="external">crypto</use>
***/
#include "asterisk.h"
Modified: branches/1.8/funcs/func_speex.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/funcs/func_speex.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/funcs/func_speex.c (original)
+++ branches/1.8/funcs/func_speex.c Tue Jul 5 17:08:29 2011
@@ -33,7 +33,7 @@
/*** MODULEINFO
<depend>speex</depend>
<depend>speex_preprocess</depend>
- <use>speexdsp</use>
+ <use type="external">speexdsp</use>
***/
#include "asterisk.h"
Modified: branches/1.8/pbx/pbx_dundi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/pbx/pbx_dundi.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/pbx/pbx_dundi.c (original)
+++ branches/1.8/pbx/pbx_dundi.c Tue Jul 5 17:08:29 2011
@@ -23,7 +23,7 @@
/*** MODULEINFO
<depend>zlib</depend>
- <use>crypto</use>
+ <use type="external">crypto</use>
***/
#include "asterisk.h"
Modified: branches/1.8/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_jabber.c?view=diff&rev=326411&r1=326410&r2=326411
==============================================================================
--- branches/1.8/res/res_jabber.c (original)
+++ branches/1.8/res/res_jabber.c Tue Jul 5 17:08:29 2011
@@ -32,7 +32,7 @@
/*** MODULEINFO
<depend>iksemel</depend>
- <use>openssl</use>
+ <use type="external">openssl</use>
***/
#include "asterisk.h"
More information about the asterisk-commits
mailing list