Merged revisions 53779-53781 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53779 | kpfleming | 2007-02-09 17:51:29 -0600 (Fri, 09 Feb 2007) | 2 lines

fix awk scripts to work when both MODULEINFO and MAKEOPTS are present in a source file

........
r53780 | kpfleming | 2007-02-09 17:51:41 -0600 (Fri, 09 Feb 2007) | 2 lines

add some inter-module dependencies

........
r53781 | kpfleming | 2007-02-09 17:52:44 -0600 (Fri, 09 Feb 2007) | 2 lines

another dependency

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53782 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index c61f6bf3fb657736a0c78ae8a441c4f1403359d5..40330152b03d79078657cb5cb2800ef310001b93 100644 (file)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+       <depend>res_adsi</depend>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b79ba962868f287011b1f8568024f4a380395286..3b8a8c34bcbea31e20d65436cbbee21407479e15 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -28,14 +28,20 @@
  * \note This module requires res_adsi to load.
  */
 
+/*** MODULEINFO
+       <depend>res_adsi</depend>
+ ***/
+
 /*** MAKEOPTS
 <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o">
        <member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
                <depend>unixodbc</depend>
+               <conflict>IMAP_STORAGE</conflict>
                <defaultenabled>no</defaultenabled>
        </member>
        <member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
                <depend>imap_tk</depend>
+               <conflict>ODBC_STORAGE</conflict>
                <use>ssl</use>
                <defaultenabled>no</defaultenabled>
        </member>

diff --git a/build_tools/get_makeopts b/build_tools/get_makeopts
index 15ad97b750b9ec29b9e5289333f9bf9a4bb9c88d..e63622afd167985f484d34f8b6079d07373d8ec6 100644 (file)
--- a/build_tools/get_makeopts
+++ b/build_tools/get_makeopts
@@ -1,3 +1,3 @@
 /\/\*\*\* MAKEOPTS/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
 // {if (printit) print}

diff --git a/build_tools/get_moduleinfo b/build_tools/get_moduleinfo
index 08ae61cbfca0945e57a976ac5daa1c3b5e42c8f6..d17c28e06356d9379cda9913984d05740153d5fd 100644 (file)
--- a/build_tools/get_moduleinfo
+++ b/build_tools/get_moduleinfo
@@ -1,3 +1,3 @@
 /\/\*\*\* MODULEINFO/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
 // {if (printit) print}

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index fa1d216aa1ff12d0c3465d07f68fc14484d87026..f84d6d896b2e85a58456aa224e1dff0c7746ee87 100644 (file)
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
        <depend>iksemel</depend>
+       <depend>res_jabber</depend>
  ***/
 
 #include "asterisk.h"

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 03876779c416fda685bf0798a8001dac36925ef7..5506c31b5fa66cedd8998846ca49d3dd6a772bbb 100644 (file)
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
        <depend>unixodbc</depend>
+       <depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"

diff --git a/res/res_adsi.c b/res/res_adsi.c
index 62f838198d83b2def1476c14b493d5d2cf9b979c..a384ac962fc90937f508b27c89921a315a8c38e5 100644 (file)
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -1144,7 +1144,7 @@ static int unload_module(void)
        return -1;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource (not optional)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource",
                .load = load_module,
                .unload = unload_module,
                .reload = reload,

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 5c725a0e128e358f303923644e26f8bf85d11105..0e317640f3c3982516703d13a1ee1421da3ec038 100644 (file)
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
        <depend>unixodbc</depend>
+       <depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"