Merge #exec functionality (must be explicitly enabled!)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4950 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 0 deletions

diff --git a/asterisk.c b/asterisk.c
index 27fddf945..47b8b2ecd 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -70,6 +70,7 @@
 
 int option_verbose=0;
 int option_debug=0;
+int option_exec_includes=0;
 int option_nofork=0;
 int option_quiet=0;
 int option_console=0;
@@ -1547,6 +1548,8 @@ static void ast_readconfig(void) {
 	while(v) {
 		if (!strcasecmp(v->name, "verbose")) {
 			option_verbose= atoi(v->value);
+		} else if (!strcasecmp(v->name, "execincludes")) {
+			option_exec_includes = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "debug")) {
 			option_debug= ast_true(v->value);
 		} else if (!strcasecmp(v->name, "nofork")) {