[asterisk-commits] murf: trunk r80718 - in /trunk: ./ utils/ael_main.c utils/conf2ael.c

[SVN commits to the Asterisk project]

Author: murf
Date: Fri Aug 24 09:55:34 2007
New Revision: 80718

URL: http://svn.digium.com/view/asterisk?view=rev&rev=80718
Log:
Merged revisions 80717 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80717 | murf | 2007-08-24 08:48:49 -0600 (Fri, 24 Aug 2007) | 1 line

This change addresses JerJer's complaint that aelparse builds and installs even if pbx_ael is unchecked in the menuselect stuff.
........

Modified:
    trunk/   (props changed)
    trunk/utils/ael_main.c
    trunk/utils/conf2ael.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/ael_main.c?view=diff&rev=80718&r1=80717&r2=80718
==============================================================================
--- trunk/utils/ael_main.c (original)
+++ trunk/utils/ael_main.c Fri Aug 24 09:55:34 2007
@@ -17,6 +17,10 @@
 #include "asterisk/app.h"
 #include "asterisk/ael_structs.h"
 #include "asterisk/extconf.h"
+
+/*** MODULEINFO
+ * 	<depend>res_ael_share</depend>
+ * 	 ***/
 
 struct namelist
 {

Modified: trunk/utils/conf2ael.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/conf2ael.c?view=diff&rev=80718&r1=80717&r2=80718
==============================================================================
--- trunk/utils/conf2ael.c (original)
+++ trunk/utils/conf2ael.c Fri Aug 24 09:55:34 2007
@@ -22,7 +22,9 @@
  *
  */
 
-
+/*** MODULEINFO
+ * 	<depend>res_ael_share</depend>
+ * 	 ***/
 
 #include "asterisk/autoconfig.h"