Merged revisions 53779-53781 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Fri, 9 Feb 2007 23:53:51 +0000 (23:53 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Fri, 9 Feb 2007 23:53:51 +0000 (23:53 +0000)
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

apps/app_adsiprog.c
apps/app_voicemail.c
build_tools/get_makeopts
build_tools/get_moduleinfo
channels/chan_gtalk.c
funcs/func_odbc.c
res/res_adsi.c
res/res_config_odbc.c

index c61f6bf..4033015 100644 (file)
  * \ingroup applications
  */
 
+/*** MODULEINFO
+       <depend>res_adsi</depend>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
index b79ba96..3b8a8c3 100644 (file)
  * \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>
index 15ad97b..e63622a 100644 (file)
@@ -1,3 +1,3 @@
 /\/\*\*\* MAKEOPTS/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
 // {if (printit) print}
index 08ae61c..d17c28e 100644 (file)
@@ -1,3 +1,3 @@
 /\/\*\*\* MODULEINFO/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
 // {if (printit) print}
index fa1d216..f84d6d8 100644 (file)
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
        <depend>iksemel</depend>
+       <depend>res_jabber</depend>
  ***/
 
 #include "asterisk.h"
index 0387677..5506c31 100644 (file)
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
        <depend>unixodbc</depend>
+       <depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"
index 62f8381..a384ac9 100644 (file)
@@ -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,
index 5c725a0..0e31764 100644 (file)
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
        <depend>unixodbc</depend>
+       <depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"