[asterisk-commits] russell: branch group/vldtmf_fixup r51268 - in /team/group/vldtmf_fixup: ./ a...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Jan 18 16:04:32 MST 2007 

Author: russell
Date: Thu Jan 18 17:04:31 2007
New Revision: 51268

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

........
r51262 | russell | 2007-01-18 15:54:23 -0600 (Thu, 18 Jan 2007) | 5 lines

Ensure that the locations given to the Asterisk configure script for ncurses,
curses, termcap, or tinfo are further passed along to the editline configure
script.  This fixes some cross-compilation environments.
(issue #8637, reported by ovi, patch by me)

........
r51265 | qwell | 2007-01-18 16:50:23 -0600 (Thu, 18 Jan 2007) | 4 lines

Add some more checks for option_debug before ast_log(LOG_DEBUG, ...) calls.

Issue 8832, patch(es) by tgrman

........

Modified:
    team/group/vldtmf_fixup/   (props changed)
    team/group/vldtmf_fixup/Makefile
    team/group/vldtmf_fixup/acinclude.m4
    team/group/vldtmf_fixup/apps/app_voicemail.c
    team/group/vldtmf_fixup/configure
    team/group/vldtmf_fixup/funcs/func_strings.c
    team/group/vldtmf_fixup/main/Makefile
    team/group/vldtmf_fixup/main/app.c
    team/group/vldtmf_fixup/main/channel.c
    team/group/vldtmf_fixup/main/pbx.c
    team/group/vldtmf_fixup/makeopts.in

Propchange: team/group/vldtmf_fixup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 18 17:04:31 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-51258
+/branches/1.4:1-51267

Modified: team/group/vldtmf_fixup/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/Makefile?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/Makefile (original)
+++ team/group/vldtmf_fixup/Makefile Thu Jan 18 17:04:31 2007
@@ -59,6 +59,10 @@
 export STRIP
 export DOWNLOAD
 export OSARCH
+export CURSES_DIR
+export NCURSES_DIR
+export TERMCAP_DIR
+export TINFO_DIR
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't

Modified: team/group/vldtmf_fixup/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/acinclude.m4?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/acinclude.m4 (original)
+++ team/group/vldtmf_fixup/acinclude.m4 Thu Jan 18 17:04:31 2007
@@ -34,6 +34,7 @@
 PBX_$1=0
 AC_SUBST([$1_LIB])
 AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
 AC_SUBST([PBX_$1])
 ])
 

Modified: team/group/vldtmf_fixup/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/apps/app_voicemail.c?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/apps/app_voicemail.c (original)
+++ team/group/vldtmf_fixup/apps/app_voicemail.c Thu Jan 18 17:04:31 2007
@@ -1956,12 +1956,14 @@
 		create_dirpath(tmpdir, sizeof(tmpdir), vmu->context, vmu->mailbox, "tmp");
 		snprintf(newtmp, sizeof(newtmp), "%s/XXXXXX", tmpdir);
 		tmpfd = mkstemp(newtmp);
-		ast_log(LOG_DEBUG, "newtmp: %s\n", newtmp);
+		if (option_debug > 2)
+			ast_log(LOG_DEBUG, "newtmp: %s\n", newtmp);
 		if (vmu->volgain < -.001 || vmu->volgain > .001) {
 			snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, attach, format, newtmp, format);
 			ast_safe_system(tmpcmd);
 			attach = newtmp;
-			ast_log(LOG_DEBUG, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
+			if (option_debug > 2)
+				ast_log(LOG_DEBUG, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
 		}
 		fprintf(p, "--%s\r\n", bound);
 		fprintf(p, "Content-Type: %s%s; name=\"msg%04d.%s\"\r\n", ctype, format, msgnum, format);
@@ -1998,7 +2000,8 @@
 	}
 	if (!strcmp(format, "wav49"))
 		format = "WAV";
-	ast_log(LOG_DEBUG, "Attaching file '%s', format '%s', uservm is '%d', global is %d\n", attach, format, attach_user_voicemail, ast_test_flag((&globalflags), VM_ATTACH));
+	if (option_debug > 2)
+		ast_log(LOG_DEBUG, "Attaching file '%s', format '%s', uservm is '%d', global is %d\n", attach, format, attach_user_voicemail, ast_test_flag((&globalflags), VM_ATTACH));
 	/* Make a temporary file instead of piping directly to sendmail, in case the mail
 	   command hangs */
 	if ((p = vm_mkftemp(tmp)) == NULL) {
@@ -2009,7 +2012,8 @@
 		fclose(p);
 		snprintf(tmp2, sizeof(tmp2), "( %s < %s ; rm -f %s ) &", mailcmd, tmp, tmp);
 		ast_safe_system(tmp2);
-		ast_log(LOG_DEBUG, "Sent mail to %s with command '%s'\n", vmu->email, mailcmd);
+		if (option_debug > 2)
+			ast_log(LOG_DEBUG, "Sent mail to %s with command '%s'\n", vmu->email, mailcmd);
 	}
 	return 0;
 }
@@ -2092,7 +2096,8 @@
 		fclose(p);
 		snprintf(tmp2, sizeof(tmp2), "( %s < %s ; rm -f %s ) &", mailcmd, tmp, tmp);
 		ast_safe_system(tmp2);
-		ast_log(LOG_DEBUG, "Sent page to %s with command '%s'\n", pager, mailcmd);
+		if (option_debug > 2)
+			ast_log(LOG_DEBUG, "Sent page to %s with command '%s'\n", pager, mailcmd);
 	}
 	return 0;
 }
@@ -2764,14 +2769,16 @@
 			ast_log(LOG_WARNING, "The switch reported '%s'\n", mwi_msg->cause);
 			ASTOBJ_UNREF(mwi_msg, ast_smdi_mwi_message_destroy);
 		} else {
-			ast_log(LOG_DEBUG, "Successfully executed SMDI MWI change for %s on %s\n", extension, smdi_iface->name);
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Successfully executed SMDI MWI change for %s on %s\n", extension, smdi_iface->name);
 		}
 	} else if (!ast_strlen_zero(externnotify)) {
 		if (inboxcount(ext_context, &newvoicemails, &oldvoicemails)) {
 			ast_log(LOG_ERROR, "Problem in calculating number of voicemail messages available for extension %s\n", extension);
 		} else {
 			snprintf(arguments, sizeof(arguments), "%s %s %s %d&", externnotify, context, extension, newvoicemails);
-			ast_log(LOG_DEBUG, "Executing %s\n", arguments);
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Executing %s\n", arguments);
 			ast_safe_system(arguments);
 		}
 	}
@@ -2896,12 +2903,14 @@
 			if (ast_streamfile(chan, prefile, chan->language) > -1) 
 				res = ast_waitstream(chan, ecodes);
 		} else {
-			ast_log(LOG_DEBUG, "%s doesn't exist, doing what we can\n", prefile);
+			if (option_debug)
+				ast_log(LOG_DEBUG, "%s doesn't exist, doing what we can\n", prefile);
 			res = invent_message(chan, vmu->context, ext, ast_test_flag(options, OPT_BUSY_GREETING), ecodes);
 		}
 		DISPOSE(prefile, -1);
 		if (res < 0) {
-			ast_log(LOG_DEBUG, "Hang up during prefile playback\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Hang up during prefile playback\n");
 			free_user(vmu);
 			pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED");
 			return -1;
@@ -3351,7 +3360,8 @@
 	bytes += ast_adsi_voice_mode(buf + bytes, 0);
 	ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD);
 
-	ast_log(LOG_DEBUG, "Done downloading scripts...\n");
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Done downloading scripts...\n");
 
 #ifdef DISPLAY
 	/* Add last dot */
@@ -3359,7 +3369,8 @@
 	bytes += ast_adsi_display(buf + bytes, ADSI_COMM_PAGE, 4, ADSI_JUST_CENT, 0, "   ......", "");
 	bytes += ast_adsi_set_line(buf + bytes, ADSI_COMM_PAGE, 1);
 #endif
-	ast_log(LOG_DEBUG, "Restarting session...\n");
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Restarting session...\n");
 
 	bytes = 0;
 	/* Load the session now */
@@ -4252,13 +4263,15 @@
 		return res;
 
 	/* Strip off caller ID number from name */
-	ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context);
+	if (option_debug > 2)
+		ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context);
 	ast_callerid_parse(cid, &name, &callerid);
 	if ((!ast_strlen_zero(callerid)) && strcmp(callerid, "Unknown")) {
 		/* Check for internal contexts and only */
 		/* say extension when the call didn't come from an internal context in the list */
 		for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){
-			ast_log(LOG_DEBUG, "VM-CID: comparing internalcontext: %s\n", cidinternalcontexts[i]);
+			if (option_debug > 2)
+				ast_log(LOG_DEBUG, "VM-CID: comparing internalcontext: %s\n", cidinternalcontexts[i]);
 			if ((strcmp(cidinternalcontexts[i], context) == 0))
 				break;
 		}
@@ -4286,7 +4299,8 @@
 		}
 
 		else if (!res){
-			ast_log(LOG_DEBUG, "VM-CID: Numeric caller id: (%s)\n",callerid);
+			if (option_debug > 2)
+				ast_log(LOG_DEBUG, "VM-CID: Numeric caller id: (%s)\n",callerid);
 			/* BB: Since this is all nicely figured out, why not say "from phone number" in this case" */
 			if (!callback)
 				res = wait_file2(chan, vms, "vm-from-phonenumber");
@@ -4294,7 +4308,8 @@
 		}
 	} else {
 		/* Number unknown */
-		ast_log(LOG_DEBUG, "VM-CID: From an unknown number\n");
+		if (option_debug)
+			ast_log(LOG_DEBUG, "VM-CID: From an unknown number\n");
 		/* Say "from an unknown caller" as one phrase - it is already recorded by "the voice" anyhow */
 		res = wait_file2(chan, vms, "vm-unknown-caller");
 	}
@@ -4314,7 +4329,8 @@
 	durations=atoi(duration);
 	durationm=(durations / 60);
 
-	ast_log(LOG_DEBUG, "VM-Duration: duration is: %d seconds converted to: %d minutes\n", durations, durationm);
+	if (option_debug > 2)
+		ast_log(LOG_DEBUG, "VM-Duration: duration is: %d seconds converted to: %d minutes\n", durations, durationm);
 
 	if ((!res) && (durationm >= minduration)) {
 		res = wait_file2(chan, vms, "vm-duration");
@@ -4613,7 +4629,8 @@
 	if(option_debug > 2)
 		ast_log (LOG_DEBUG,"vm_state user is:%s\n",vms->imapuser);
 	if (vms->mailstream == NIL || !vms->mailstream) {
-		ast_log (LOG_DEBUG,"mailstream not set.\n");
+		if (option_debug)
+			ast_log (LOG_DEBUG,"mailstream not set.\n");
 	} else {
 		stream = vms->mailstream;
 	}
@@ -5684,7 +5701,8 @@
 		vm_change_password(vmu,newpassword);
 	else 
 		vm_change_password_shell(vmu,newpassword);
-	ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword));
+	if (option_debug > 2)
+		ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword));
 	cmd = ast_play_and_wait(chan,"vm-passchanged");
 
 	/* If forcename is set, have the user record their name */	
@@ -5786,7 +5804,8 @@
 				vm_change_password(vmu,newpassword);
 			else 
 				vm_change_password_shell(vmu,newpassword);
-			ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword));
+			if (option_debug > 2)
+				ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword));
 			cmd = ast_play_and_wait(chan,"vm-passchanged");
 			break;
 		case '*': 
@@ -6037,7 +6056,8 @@
 			ast_copy_string(mailbox, fullusername, mailbox_size);
 		}
 
-		ast_log(LOG_DEBUG, "Before find user for mailbox %s\n",mailbox);
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Before find user for mailbox %s\n",mailbox);
 		vmu = find_user(&vmus, context, mailbox);
 		if (vmu && (vmu->password[0] == '\0' || (vmu->password[0] == '-' && vmu->password[1] == '\0'))) {
 			/* saved password is blank, so don't bother asking */
@@ -6129,7 +6149,8 @@
 	memset(&vmus, 0, sizeof(vmus));
 
 	if (chan->_state != AST_STATE_UP) {
-		ast_log(LOG_DEBUG, "Before ast_answer\n");
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Before ast_answer\n");
 		ast_answer(chan);
 	}
 
@@ -6211,7 +6232,8 @@
 	if (!valid)
 		res = vm_authenticate(chan, vms.username, sizeof(vms.username), &vmus, context, prefixstr, skipuser, maxlogins, 0);
 
-	ast_log(LOG_DEBUG, "After vm_authenticate\n");
+	if (option_debug)
+		ast_log(LOG_DEBUG, "After vm_authenticate\n");
 	if (!res) {
 		valid = 1;
 		if (!skipuser)
@@ -6246,18 +6268,21 @@
 	create_dirpath(vms.curdir, sizeof(vms.curdir), vmu->context, vms.username, "");
 #endif
 	/* Retrieve old and new message counts */
-	ast_log(LOG_DEBUG, "Before open_mailbox\n");
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Before open_mailbox\n");
 	res = open_mailbox(&vms, vmu, 1);
 	if (res == ERROR_LOCK_PATH)
 		goto out;
 	vms.oldmessages = vms.lastmsg + 1;
-	ast_log(LOG_DEBUG, "Number of old messages: %d\n",vms.oldmessages);
+	if (option_debug > 2)
+		ast_log(LOG_DEBUG, "Number of old messages: %d\n",vms.oldmessages);
 	/* Start in INBOX */
 	res = open_mailbox(&vms, vmu, 0);
 	if (res == ERROR_LOCK_PATH)
 		goto out;
 	vms.newmessages = vms.lastmsg + 1;
-	ast_log(LOG_DEBUG, "Number of new messages: %d\n",vms.newmessages);
+	if (option_debug > 2)
+		ast_log(LOG_DEBUG, "Number of new messages: %d\n",vms.newmessages);
 		
 	/* Select proper mailbox FIRST!! */
 	if (play_auto) {
@@ -6304,7 +6329,8 @@
 		if(option_debug > 2)
 			ast_log(LOG_DEBUG, "Checking quotas: comparing %u to %u\n",vms.quota_usage,vms.quota_limit);
 		if (vms.quota_limit && vms.quota_usage >= vms.quota_limit) {
-			ast_log(LOG_DEBUG, "*** QUOTA EXCEEDED!!\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "*** QUOTA EXCEEDED!!\n");
 			cmd = ast_play_and_wait(chan, "vm-mailboxfull");
 		}
 #endif
@@ -7154,13 +7180,16 @@
 		
 		if ((notifystr = ast_variable_retrieve(cfg, "general", "externnotify"))) {
 			ast_copy_string(externnotify, notifystr, sizeof(externnotify));
-			ast_log(LOG_DEBUG, "found externnotify: %s\n", externnotify);
+			if (option_debug > 2)
+				ast_log(LOG_DEBUG, "found externnotify: %s\n", externnotify);
 			if (!strcasecmp(externnotify, "smdi")) {
-				ast_log(LOG_DEBUG, "Using SMDI for external voicemail notification\n");
+				if (option_debug)
+					ast_log(LOG_DEBUG, "Using SMDI for external voicemail notification\n");
 				if ((smdistr = ast_variable_retrieve(cfg, "general", "smdiport"))) {
 					smdi_iface = ast_smdi_interface_find(smdistr);
 				} else {
-					ast_log(LOG_DEBUG, "No SMDI interface set, trying default (/dev/ttyS0)\n");
+					if (option_debug)
+						ast_log(LOG_DEBUG, "No SMDI interface set, trying default (/dev/ttyS0)\n");
 					smdi_iface = ast_smdi_interface_find("/dev/ttyS0");
 				}
 
@@ -7168,7 +7197,8 @@
 					ast_log(LOG_ERROR, "No valid SMDI interface specfied, disabling external voicemail notification\n");
 					externnotify[0] = '\0';
 				} else {
-					ast_log(LOG_DEBUG, "Using SMDI port %s\n", smdi_iface->name);
+					if (option_debug > 2)
+						ast_log(LOG_DEBUG, "Using SMDI port %s\n", smdi_iface->name);
 				}
 			}
 		} else {
@@ -7245,7 +7275,8 @@
 		ast_set2_flag((&globalflags), ast_true(astforcegreet), VM_FORCEGREET);
 
 		if ((s = ast_variable_retrieve(cfg, "general", "cidinternalcontexts"))){
-			ast_log(LOG_DEBUG,"VM_CID Internal context string: %s\n",s);
+			if (option_debug > 2)
+				ast_log(LOG_DEBUG,"VM_CID Internal context string: %s\n",s);
 			stringp = ast_strdupa(s);
 			for (x = 0 ; x < MAX_NUM_CID_CONTEXTS ; x++){
 				if (!ast_strlen_zero(stringp)) {
@@ -7253,53 +7284,62 @@
 					while ((*q == ' ')||(*q == '\t')) /* Eat white space between contexts */
 						q++;
 					ast_copy_string(cidinternalcontexts[x], q, sizeof(cidinternalcontexts[x]));
-					ast_log(LOG_DEBUG,"VM_CID Internal context %d: %s\n", x, cidinternalcontexts[x]);
+					if (option_debug > 2)
+						ast_log(LOG_DEBUG,"VM_CID Internal context %d: %s\n", x, cidinternalcontexts[x]);
 				} else {
 					cidinternalcontexts[x][0] = '\0';
 				}
 			}
 		}
 		if (!(astreview = ast_variable_retrieve(cfg, "general", "review"))){
-			ast_log(LOG_DEBUG,"VM Review Option disabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG,"VM Review Option disabled globally\n");
 			astreview = "no";
 		}
 		ast_set2_flag((&globalflags), ast_true(astreview), VM_REVIEW);	
 
 		/*Temperary greeting reminder */
 		if (!(asttempgreetwarn = ast_variable_retrieve(cfg, "general", "tempgreetwarn"))) {
-			ast_log(LOG_DEBUG, "VM Temperary Greeting Reminder Option disabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "VM Temperary Greeting Reminder Option disabled globally\n");
 			asttempgreetwarn = "no";
 		} else {
-			ast_log(LOG_DEBUG, "VM Temperary Greeting Reminder Option enabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "VM Temperary Greeting Reminder Option enabled globally\n");
 		}
 		ast_set2_flag((&globalflags), ast_true(asttempgreetwarn), VM_TEMPGREETWARN);
 
 		if (!(astcallop = ast_variable_retrieve(cfg, "general", "operator"))){
-			ast_log(LOG_DEBUG,"VM Operator break disabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG,"VM Operator break disabled globally\n");
 			astcallop = "no";
 		}
 		ast_set2_flag((&globalflags), ast_true(astcallop), VM_OPERATOR);	
 
 		if (!(astsaycid = ast_variable_retrieve(cfg, "general", "saycid"))) {
-			ast_log(LOG_DEBUG,"VM CID Info before msg disabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG,"VM CID Info before msg disabled globally\n");
 			astsaycid = "no";
 		} 
 		ast_set2_flag((&globalflags), ast_true(astsaycid), VM_SAYCID);	
 
 		if (!(send_voicemail = ast_variable_retrieve(cfg,"general", "sendvoicemail"))){
-			ast_log(LOG_DEBUG,"Send Voicemail msg disabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG,"Send Voicemail msg disabled globally\n");
 			send_voicemail = "no";
 		}
 		ast_set2_flag((&globalflags), ast_true(send_voicemail), VM_SVMAIL);
 	
 		if (!(asthearenv = ast_variable_retrieve(cfg, "general", "envelope"))) {
-			ast_log(LOG_DEBUG,"ENVELOPE before msg enabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG,"ENVELOPE before msg enabled globally\n");
 			asthearenv = "yes";
 		}
 		ast_set2_flag((&globalflags), ast_true(asthearenv), VM_ENVELOPE);	
 
 		if (!(astsaydurationinfo = ast_variable_retrieve(cfg, "general", "sayduration"))) {
-			ast_log(LOG_DEBUG,"Duration info before msg enabled globally\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG,"Duration info before msg enabled globally\n");
 			astsaydurationinfo = "yes";
 		}
 		ast_set2_flag((&globalflags), ast_true(astsaydurationinfo), VM_SAYDURATION);	
@@ -7314,28 +7354,32 @@
 		}
 
 		if (!(astskipcmd = ast_variable_retrieve(cfg, "general", "nextaftercmd"))) {
-			ast_log(LOG_DEBUG,"We are not going to skip to the next msg after save/delete\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG,"We are not going to skip to the next msg after save/delete\n");
 			astskipcmd = "no";
 		}
 		ast_set2_flag((&globalflags), ast_true(astskipcmd), VM_SKIPAFTERCMD);
 
 		if ((dialoutcxt = ast_variable_retrieve(cfg, "general", "dialout"))) {
 			ast_copy_string(dialcontext, dialoutcxt, sizeof(dialcontext));
-			ast_log(LOG_DEBUG, "found dialout context: %s\n", dialcontext);
+			if (option_debug)
+				ast_log(LOG_DEBUG, "found dialout context: %s\n", dialcontext);
 		} else {
 			dialcontext[0] = '\0';	
 		}
 		
 		if ((callbackcxt = ast_variable_retrieve(cfg, "general", "callback"))) {
 			ast_copy_string(callcontext, callbackcxt, sizeof(callcontext));
-			ast_log(LOG_DEBUG, "found callback context: %s\n", callcontext);
+			if (option_debug)
+				ast_log(LOG_DEBUG, "found callback context: %s\n", callcontext);
 		} else {
 			callcontext[0] = '\0';
 		}
 
 		if ((exitcxt = ast_variable_retrieve(cfg, "general", "exitcontext"))) {
 			ast_copy_string(exitcontext, exitcxt, sizeof(exitcontext));
-			ast_log(LOG_DEBUG, "found operator context: %s\n", exitcontext);
+			if (option_debug)
+				ast_log(LOG_DEBUG, "found operator context: %s\n", exitcontext);
 		} else {
 			exitcontext[0] = '\0';
 		}

Modified: team/group/vldtmf_fixup/configure
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/configure?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/configure (original)
+++ team/group/vldtmf_fixup/configure Thu Jan 18 17:04:31 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 49866 .
+# From configure.ac Revision: 51239 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -718,114 +718,151 @@
 AST_DEVMODE
 ALSA_LIB
 ALSA_INCLUDE
+ALSA_DIR
 PBX_ALSA
 CURL_LIB
 CURL_INCLUDE
+CURL_DIR
 PBX_CURL
 CURSES_LIB
 CURSES_INCLUDE
+CURSES_DIR
 PBX_CURSES
 GNUTLS_LIB
 GNUTLS_INCLUDE
+GNUTLS_DIR
 PBX_GNUTLS
 GSM_LIB
 GSM_INCLUDE
+GSM_DIR
 PBX_GSM
 IKSEMEL_LIB
 IKSEMEL_INCLUDE
+IKSEMEL_DIR
 PBX_IKSEMEL
 IMAP_TK_LIB
 IMAP_TK_INCLUDE
+IMAP_TK_DIR
 PBX_IMAP_TK
 ISDNNET_LIB
 ISDNNET_INCLUDE
+ISDNNET_DIR
 PBX_ISDNNET
 KDE_LIB
 KDE_INCLUDE
+KDE_DIR
 PBX_KDE
 MISDN_LIB
 MISDN_INCLUDE
+MISDN_DIR
 PBX_MISDN
 NBS_LIB
 NBS_INCLUDE
+NBS_DIR
 PBX_NBS
 NCURSES_LIB
 NCURSES_INCLUDE
+NCURSES_DIR
 PBX_NCURSES
 NETSNMP_LIB
 NETSNMP_INCLUDE
+NETSNMP_DIR
 PBX_NETSNMP
 NEWT_LIB
 NEWT_INCLUDE
+NEWT_DIR
 PBX_NEWT
 UNIXODBC_LIB
 UNIXODBC_INCLUDE
+UNIXODBC_DIR
 PBX_UNIXODBC
 OGG_LIB
 OGG_INCLUDE
+OGG_DIR
 PBX_OGG
 OSPTK_LIB
 OSPTK_INCLUDE
+OSPTK_DIR
 PBX_OSPTK
 OSS_LIB
 OSS_INCLUDE
+OSS_DIR
 PBX_OSS
 POPT_LIB
 POPT_INCLUDE
+POPT_DIR
 PBX_POPT
 PGSQL_LIB
 PGSQL_INCLUDE
+PGSQL_DIR
 PBX_PGSQL
 PRI_LIB
 PRI_INCLUDE
+PRI_DIR
 PBX_PRI
 PWLIB_LIB
 PWLIB_INCLUDE
+PWLIB_DIR
 PBX_PWLIB
 OPENH323_LIB
 OPENH323_INCLUDE
+OPENH323_DIR
 PBX_OPENH323
 QT_LIB
 QT_INCLUDE
+QT_DIR
 PBX_QT
 RADIUS_LIB
 RADIUS_INCLUDE
+RADIUS_DIR
 PBX_RADIUS
 SPEEX_LIB
 SPEEX_INCLUDE
+SPEEX_DIR
 PBX_SPEEX
 SQLITE_LIB
 SQLITE_INCLUDE
+SQLITE_DIR
 PBX_SQLITE
 SUPPSERV_LIB
 SUPPSERV_INCLUDE
+SUPPSERV_DIR
 PBX_SUPPSERV
 OPENSSL_LIB
 OPENSSL_INCLUDE
+OPENSSL_DIR
 PBX_OPENSSL
 FREETDS_LIB
 FREETDS_INCLUDE
+FREETDS_DIR
 PBX_FREETDS
 TERMCAP_LIB
 TERMCAP_INCLUDE
+TERMCAP_DIR
 PBX_TERMCAP
 TINFO_LIB
 TINFO_INCLUDE
+TINFO_DIR
 PBX_TINFO
 TONEZONE_LIB
 TONEZONE_INCLUDE
+TONEZONE_DIR
 PBX_TONEZONE
 VORBIS_LIB
 VORBIS_INCLUDE
+VORBIS_DIR
 PBX_VORBIS
 VPB_LIB
 VPB_INCLUDE
+VPB_DIR
 PBX_VPB
 ZLIB_LIB
 ZLIB_INCLUDE
+ZLIB_DIR
 PBX_ZLIB
 ZAPTEL_LIB
 ZAPTEL_INCLUDE
+ZAPTEL_DIR
 PBX_ZAPTEL
 ALLOCA
 LIBOBJS
@@ -7527,6 +7564,7 @@
 
 
 
+
 CURL_DESCRIP="cURL"
 CURL_OPTION="curl"
 
@@ -7554,6 +7592,7 @@
 
 
 
+
 CURSES_DESCRIP="curses"
 CURSES_OPTION="curses"
 
@@ -7581,6 +7620,7 @@
 
 
 
+
 GNUTLS_DESCRIP="GNU TLS support (used for iksemel only)"
 GNUTLS_OPTION="gnutls"
 
@@ -7608,6 +7648,7 @@
 
 
 
+
 GSM_DESCRIP="GSM"
 GSM_OPTION="gsm"
 
@@ -7635,6 +7676,7 @@
 
 
 
+
 IKSEMEL_DESCRIP="Iksemel Jabber Library"
 IKSEMEL_OPTION="iksemel"
 
@@ -7662,6 +7704,7 @@
 
 
 
+
 IMAP_TK_DESCRIP="UW IMAP Toolkit"
 IMAP_TK_OPTION="imap"
 
@@ -7689,6 +7732,7 @@
 
 
 
+
 ISDNNET_DESCRIP="ISDN4Linux Library"
 ISDNNET_OPTION="isdnnet"
 
@@ -7716,6 +7760,7 @@
 
 
 
+
 KDE_DESCRIP="KDE"
 KDE_OPTION="kde"
 
@@ -7743,6 +7788,7 @@
 
 
 
+
 MISDN_DESCRIP="mISDN User Library"
 MISDN_OPTION="misdn"
 
@@ -7770,6 +7816,7 @@
 
 
 
+
 NBS_DESCRIP="Network Broadcast Sound"
 NBS_OPTION="nbs"
 
@@ -7797,6 +7844,7 @@
 
 
 
+
 NCURSES_DESCRIP="ncurses"
 NCURSES_OPTION="ncurses"
 
@@ -7824,6 +7872,7 @@
 
 
 
+
 NETSNMP_DESCRIP="Net-SNMP"
 NETSNMP_OPTION="netsnmp"
 
@@ -7851,6 +7900,7 @@
 
 
 
+
 NEWT_DESCRIP="newt"
 NEWT_OPTION="newt"
 
@@ -7878,6 +7928,7 @@
 
 
 
+
 UNIXODBC_DESCRIP="unixODBC"
 UNIXODBC_OPTION="odbc"
 
@@ -7905,6 +7956,7 @@
 
 
 
+
 OGG_DESCRIP="OGG"
 OGG_OPTION="ogg"
 
@@ -7932,6 +7984,7 @@
 
 
 
+
 OSPTK_DESCRIP="OSP Toolkit"
 OSPTK_OPTION="osptk"
 
@@ -7959,6 +8012,7 @@
 
 
 
+
 OSS_DESCRIP="Open Sound System"
 OSS_OPTION="oss"
 
@@ -7986,6 +8040,7 @@
 
 
 
+
 POPT_DESCRIP="popt"
 POPT_OPTION="popt"
 
@@ -8013,6 +8068,7 @@
 
 
 
+
 PGSQL_DESCRIP="PostgreSQL"
 PGSQL_OPTION="postgres"
 
@@ -8040,6 +8096,7 @@
 
 
 
+
 PRI_DESCRIP="ISDN PRI"
 PRI_OPTION="pri"
 
@@ -8067,6 +8124,7 @@
 
 
 
+
 PWLIB_DESCRIP="PWlib"
 PWLIB_OPTION="pwlib"
 
@@ -8094,6 +8152,7 @@
 
 
 
+
 OPENH323_DESCRIP="OpenH323"
 OPENH323_OPTION="h323"
 
@@ -8121,6 +8180,7 @@
 
 
 
+
 QT_DESCRIP="Qt"
 QT_OPTION="qt"
 
@@ -8148,6 +8208,7 @@
 
 
 
+
 RADIUS_DESCRIP="Radius Client"
 RADIUS_OPTION="radius"
 
@@ -8175,6 +8236,7 @@
 
 
 
+
 SPEEX_DESCRIP="Speex"
 SPEEX_OPTION="speex"
 
@@ -8202,6 +8264,7 @@
 
 
 
+
 SQLITE_DESCRIP="SQLite"
 SQLITE_OPTION="sqlite"
 
@@ -8229,6 +8292,7 @@
 
 
 
+
 SUPPSERV_DESCRIP="mISDN Supplemental Services"
 SUPPSERV_OPTION="suppserv"
 
@@ -8256,6 +8320,7 @@
 
 
 
+
 OPENSSL_DESCRIP="OpenSSL"
 OPENSSL_OPTION="ssl"
 
@@ -8283,6 +8348,7 @@
 
 
 
+
 FREETDS_DESCRIP="FreeTDS"
 FREETDS_OPTION="tds"
 
@@ -8310,6 +8376,7 @@
 
 
 
+
 TERMCAP_DESCRIP="Termcap"
 TERMCAP_OPTION="termcap"
 
@@ -8337,6 +8404,7 @@
 
 
 
+
 TINFO_DESCRIP="Term Info"
 TINFO_OPTION="tinfo"
 
@@ -8364,6 +8432,7 @@
 
 
 
+
 TONEZONE_DESCRIP="tonezone"
 TONEZONE_OPTION="tonezone"
 
@@ -8391,6 +8460,7 @@
 
 
 
+
 VORBIS_DESCRIP="Vorbis"
 VORBIS_OPTION="vorbis"
 
@@ -8418,6 +8488,7 @@
 
 
 
+
 VPB_DESCRIP="Voicetronix API"
 VPB_OPTION="vpb"
 
@@ -8445,6 +8516,7 @@
 
 
 
+
 ZLIB_DESCRIP="zlib"
 ZLIB_OPTION="z"
 
@@ -8472,6 +8544,7 @@
 
 
 
+
 ZAPTEL_DESCRIP="Zaptel"
 ZAPTEL_OPTION="zaptel"
 
@@ -8494,6 +8567,7 @@
 fi
 
 PBX_ZAPTEL=0
+
 
 
 
@@ -30273,101 +30347,101 @@
   cat >conf$$subs.sed <<_ACEOF
 ALSA_LIB!$ALSA_LIB$ac_delim
 ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim
+ALSA_DIR!$ALSA_DIR$ac_delim
 PBX_ALSA!$PBX_ALSA$ac_delim
 CURL_LIB!$CURL_LIB$ac_delim
 CURL_INCLUDE!$CURL_INCLUDE$ac_delim
+CURL_DIR!$CURL_DIR$ac_delim
 PBX_CURL!$PBX_CURL$ac_delim
 CURSES_LIB!$CURSES_LIB$ac_delim
 CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
+CURSES_DIR!$CURSES_DIR$ac_delim
 PBX_CURSES!$PBX_CURSES$ac_delim
 GNUTLS_LIB!$GNUTLS_LIB$ac_delim
 GNUTLS_INCLUDE!$GNUTLS_INCLUDE$ac_delim
+GNUTLS_DIR!$GNUTLS_DIR$ac_delim
 PBX_GNUTLS!$PBX_GNUTLS$ac_delim
 GSM_LIB!$GSM_LIB$ac_delim
 GSM_INCLUDE!$GSM_INCLUDE$ac_delim
+GSM_DIR!$GSM_DIR$ac_delim
 PBX_GSM!$PBX_GSM$ac_delim
 IKSEMEL_LIB!$IKSEMEL_LIB$ac_delim
 IKSEMEL_INCLUDE!$IKSEMEL_INCLUDE$ac_delim
+IKSEMEL_DIR!$IKSEMEL_DIR$ac_delim
 PBX_IKSEMEL!$PBX_IKSEMEL$ac_delim
 IMAP_TK_LIB!$IMAP_TK_LIB$ac_delim
 IMAP_TK_INCLUDE!$IMAP_TK_INCLUDE$ac_delim
+IMAP_TK_DIR!$IMAP_TK_DIR$ac_delim
 PBX_IMAP_TK!$PBX_IMAP_TK$ac_delim
 ISDNNET_LIB!$ISDNNET_LIB$ac_delim
 ISDNNET_INCLUDE!$ISDNNET_INCLUDE$ac_delim
+ISDNNET_DIR!$ISDNNET_DIR$ac_delim
 PBX_ISDNNET!$PBX_ISDNNET$ac_delim
 KDE_LIB!$KDE_LIB$ac_delim
 KDE_INCLUDE!$KDE_INCLUDE$ac_delim
+KDE_DIR!$KDE_DIR$ac_delim
 PBX_KDE!$PBX_KDE$ac_delim
 MISDN_LIB!$MISDN_LIB$ac_delim
 MISDN_INCLUDE!$MISDN_INCLUDE$ac_delim
+MISDN_DIR!$MISDN_DIR$ac_delim
 PBX_MISDN!$PBX_MISDN$ac_delim
 NBS_LIB!$NBS_LIB$ac_delim
 NBS_INCLUDE!$NBS_INCLUDE$ac_delim
+NBS_DIR!$NBS_DIR$ac_delim
 PBX_NBS!$PBX_NBS$ac_delim
 NCURSES_LIB!$NCURSES_LIB$ac_delim
 NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
+NCURSES_DIR!$NCURSES_DIR$ac_delim
 PBX_NCURSES!$PBX_NCURSES$ac_delim
 NETSNMP_LIB!$NETSNMP_LIB$ac_delim
 NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim
+NETSNMP_DIR!$NETSNMP_DIR$ac_delim
 PBX_NETSNMP!$PBX_NETSNMP$ac_delim
 NEWT_LIB!$NEWT_LIB$ac_delim
 NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim
+NEWT_DIR!$NEWT_DIR$ac_delim
 PBX_NEWT!$PBX_NEWT$ac_delim
 UNIXODBC_LIB!$UNIXODBC_LIB$ac_delim
 UNIXODBC_INCLUDE!$UNIXODBC_INCLUDE$ac_delim
+UNIXODBC_DIR!$UNIXODBC_DIR$ac_delim
 PBX_UNIXODBC!$PBX_UNIXODBC$ac_delim
 OGG_LIB!$OGG_LIB$ac_delim
 OGG_INCLUDE!$OGG_INCLUDE$ac_delim
+OGG_DIR!$OGG_DIR$ac_delim
 PBX_OGG!$PBX_OGG$ac_delim
 OSPTK_LIB!$OSPTK_LIB$ac_delim
 OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim
+OSPTK_DIR!$OSPTK_DIR$ac_delim
 PBX_OSPTK!$PBX_OSPTK$ac_delim
 OSS_LIB!$OSS_LIB$ac_delim
 OSS_INCLUDE!$OSS_INCLUDE$ac_delim
+OSS_DIR!$OSS_DIR$ac_delim
 PBX_OSS!$PBX_OSS$ac_delim
 POPT_LIB!$POPT_LIB$ac_delim
 POPT_INCLUDE!$POPT_INCLUDE$ac_delim
+POPT_DIR!$POPT_DIR$ac_delim
 PBX_POPT!$PBX_POPT$ac_delim
 PGSQL_LIB!$PGSQL_LIB$ac_delim
 PGSQL_INCLUDE!$PGSQL_INCLUDE$ac_delim
+PGSQL_DIR!$PGSQL_DIR$ac_delim
 PBX_PGSQL!$PBX_PGSQL$ac_delim
 PRI_LIB!$PRI_LIB$ac_delim
 PRI_INCLUDE!$PRI_INCLUDE$ac_delim
+PRI_DIR!$PRI_DIR$ac_delim
 PBX_PRI!$PBX_PRI$ac_delim
 PWLIB_LIB!$PWLIB_LIB$ac_delim
 PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
+PWLIB_DIR!$PWLIB_DIR$ac_delim
 PBX_PWLIB!$PBX_PWLIB$ac_delim
 OPENH323_LIB!$OPENH323_LIB$ac_delim
 OPENH323_INCLUDE!$OPENH323_INCLUDE$ac_delim
+OPENH323_DIR!$OPENH323_DIR$ac_delim
 PBX_OPENH323!$PBX_OPENH323$ac_delim
 QT_LIB!$QT_LIB$ac_delim
 QT_INCLUDE!$QT_INCLUDE$ac_delim
+QT_DIR!$QT_DIR$ac_delim
 PBX_QT!$PBX_QT$ac_delim
 RADIUS_LIB!$RADIUS_LIB$ac_delim
-RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim
-PBX_RADIUS!$PBX_RADIUS$ac_delim
-SPEEX_LIB!$SPEEX_LIB$ac_delim
-SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
-PBX_SPEEX!$PBX_SPEEX$ac_delim
-SQLITE_LIB!$SQLITE_LIB$ac_delim
-SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim
-PBX_SQLITE!$PBX_SQLITE$ac_delim
-SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim
-SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim
-PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
-OPENSSL_LIB!$OPENSSL_LIB$ac_delim
-OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
-PBX_OPENSSL!$PBX_OPENSSL$ac_delim
-FREETDS_LIB!$FREETDS_LIB$ac_delim
-FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
-PBX_FREETDS!$PBX_FREETDS$ac_delim
-TERMCAP_LIB!$TERMCAP_LIB$ac_delim
-TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim
-PBX_TERMCAP!$PBX_TERMCAP$ac_delim
-TINFO_LIB!$TINFO_LIB$ac_delim
-TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim
-PBX_TINFO!$PBX_TINFO$ac_delim
-TONEZONE_LIB!$TONEZONE_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -30409,19 +30483,56 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim
+RADIUS_DIR!$RADIUS_DIR$ac_delim
+PBX_RADIUS!$PBX_RADIUS$ac_delim
+SPEEX_LIB!$SPEEX_LIB$ac_delim
+SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
+SPEEX_DIR!$SPEEX_DIR$ac_delim
+PBX_SPEEX!$PBX_SPEEX$ac_delim
+SQLITE_LIB!$SQLITE_LIB$ac_delim
+SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim
+SQLITE_DIR!$SQLITE_DIR$ac_delim
+PBX_SQLITE!$PBX_SQLITE$ac_delim
+SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim
+SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim
+SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim
+PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
+OPENSSL_LIB!$OPENSSL_LIB$ac_delim
+OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
+OPENSSL_DIR!$OPENSSL_DIR$ac_delim
+PBX_OPENSSL!$PBX_OPENSSL$ac_delim
+FREETDS_LIB!$FREETDS_LIB$ac_delim
+FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
+FREETDS_DIR!$FREETDS_DIR$ac_delim
+PBX_FREETDS!$PBX_FREETDS$ac_delim
+TERMCAP_LIB!$TERMCAP_LIB$ac_delim
+TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim
+TERMCAP_DIR!$TERMCAP_DIR$ac_delim
+PBX_TERMCAP!$PBX_TERMCAP$ac_delim
+TINFO_LIB!$TINFO_LIB$ac_delim
+TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim
+TINFO_DIR!$TINFO_DIR$ac_delim
+PBX_TINFO!$PBX_TINFO$ac_delim
+TONEZONE_LIB!$TONEZONE_LIB$ac_delim
 TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim
+TONEZONE_DIR!$TONEZONE_DIR$ac_delim
 PBX_TONEZONE!$PBX_TONEZONE$ac_delim
 VORBIS_LIB!$VORBIS_LIB$ac_delim
 VORBIS_INCLUDE!$VORBIS_INCLUDE$ac_delim
+VORBIS_DIR!$VORBIS_DIR$ac_delim
 PBX_VORBIS!$PBX_VORBIS$ac_delim
 VPB_LIB!$VPB_LIB$ac_delim
 VPB_INCLUDE!$VPB_INCLUDE$ac_delim
+VPB_DIR!$VPB_DIR$ac_delim
 PBX_VPB!$PBX_VPB$ac_delim
 ZLIB_LIB!$ZLIB_LIB$ac_delim
 ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
+ZLIB_DIR!$ZLIB_DIR$ac_delim
 PBX_ZLIB!$PBX_ZLIB$ac_delim
 ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim
 ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
+ZAPTEL_DIR!$ZAPTEL_DIR$ac_delim
 PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
@@ -30457,7 +30568,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: team/group/vldtmf_fixup/funcs/func_strings.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/funcs/func_strings.c?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/funcs/func_strings.c (original)
+++ team/group/vldtmf_fixup/funcs/func_strings.c Thu Jan 18 17:04:31 2007
@@ -35,6 +35,7 @@
 #include <regex.h>
 
 #include "asterisk/module.h"
+#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/logger.h"
@@ -126,7 +127,8 @@
 	if ((*args.str == ' ') || (*args.str == '\t'))
 		args.str++;
 
-	ast_log(LOG_DEBUG, "FUNCTION REGEX (%s)(%s)\n", args.reg, args.str);
+	if (option_debug)
+		ast_log(LOG_DEBUG, "FUNCTION REGEX (%s)(%s)\n", args.reg, args.str);
 
 	if ((errcode = regcomp(&regexbuf, args.reg, REG_EXTENDED | REG_NOSUB))) {
 		regerror(errcode, &regexbuf, buf, len);
@@ -175,7 +177,8 @@
 	 * want them to be surprised by the result.  Hence, we prefer commas as the
 	 * delimiter, but we'll fall back to vertical bars if commas aren't found.
 	 */
-	ast_log(LOG_DEBUG, "array (%s=%s)\n", var, value2);
+	if (option_debug)
+		ast_log(LOG_DEBUG, "array (%s=%s)\n", var, value2);
 	if (strchr(var, ','))
 		AST_NONSTANDARD_APP_ARGS(arg1, var, ',');
 	else
@@ -187,8 +190,9 @@
 		AST_STANDARD_APP_ARGS(arg2, value2);
 
 	for (i = 0; i < arg1.argc; i++) {
-		ast_log(LOG_DEBUG, "array set value (%s=%s)\n", arg1.var[i],
-			arg2.val[i]);
+		if (option_debug)
+			ast_log(LOG_DEBUG, "array set value (%s=%s)\n", arg1.var[i],
+				arg2.val[i]);
 		if (i < arg2.argc) {
 			pbx_builtin_setvar_helper(chan, arg1.var[i], arg2.val[i]);
 		} else {

Modified: team/group/vldtmf_fixup/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/main/Makefile?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/main/Makefile (original)
+++ team/group/vldtmf_fixup/main/Makefile Thu Jan 18 17:04:31 2007
@@ -95,7 +95,7 @@
 endif
 
 editline/libedit.a:
-	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
 	$(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a:
@@ -141,6 +141,6 @@
 clean::
 	rm -f asterisk
 	rm -f db1-ast/.*.d
-	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
+	@if [ -f editline/Makefile ]; then $(MAKE) -C editline clean ; fi
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean

Modified: team/group/vldtmf_fixup/main/app.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/main/app.c?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/main/app.c (original)
+++ team/group/vldtmf_fixup/main/app.c Thu Jan 18 17:04:31 2007
@@ -420,7 +420,8 @@
 
 		/* We go at next loop if we got the restart char */
 		if (restart && strchr(restart, res)) {
-			ast_log(LOG_DEBUG, "we'll restart the stream here at next loop\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "we'll restart the stream here at next loop\n");
 			pause_restart_point = 0;
 			continue;
 		}
@@ -512,7 +513,8 @@
 		return -1;
 	}
 
-	ast_log(LOG_DEBUG,"play_and_record: %s, %s, '%s'\n", playfile ? playfile : "<None>", recordfile, fmt);
+	if (option_debug)
+		ast_log(LOG_DEBUG,"play_and_record: %s, %s, '%s'\n", playfile ? playfile : "<None>", recordfile, fmt);
 	snprintf(comment, sizeof(comment), "Playing %s, Recording to: %s on %s\n", playfile ? playfile : "<None>", recordfile, chan->name);
 
 	if (playfile || beep) {
@@ -533,7 +535,8 @@
 
 	stringp = fmts;
 	strsep(&stringp, "|");
-	ast_log(LOG_DEBUG, "Recording Formats: sfmts=%s\n", fmts);
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Recording Formats: sfmts=%s\n", fmts);
 	sfmt[0] = ast_strdupa(fmts);
 
 	while ((fmt = strsep(&stringp, "|"))) {
@@ -588,7 +591,8 @@
 		for (;;) {
 		 	res = ast_waitfor(chan, 2000);
 			if (!res) {
-				ast_log(LOG_DEBUG, "One waitfor failed, trying another\n");
+				if (option_debug)
+					ast_log(LOG_DEBUG, "One waitfor failed, trying another\n");
 				/* Try one more time in case of masq */
 			 	res = ast_waitfor(chan, 2000);
 				if (!res) {
@@ -935,7 +939,8 @@
 		ast_log(LOG_WARNING, "Failed to lock path '%s': %s\n", path, strerror(errno));
 		return AST_LOCK_TIMEOUT;
 	} else {
-		ast_log(LOG_DEBUG, "Locked path '%s'\n", path);
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Locked path '%s'\n", path);
 		return AST_LOCK_SUCCESS;
 	}
 }
@@ -954,8 +959,10 @@
 
 	if ((res = unlink(s)))
 		ast_log(LOG_ERROR, "Could not unlock path '%s': %s\n", path, strerror(errno));
-	else
-		ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
+	else {
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
+	}
 
 	return res;
 }
@@ -1185,7 +1192,8 @@
 		while(menu->options[pos].option) {
 			if (!strcasecmp(menu->options[pos].option, exten)) {
 				res = ivr_dispatch(chan, menu->options + pos, exten, cbdata);
-				ast_log(LOG_DEBUG, "IVR Dispatch of '%s' (pos %d) yields %d\n", exten, pos, res);
+				if (option_debug)
+					ast_log(LOG_DEBUG, "IVR Dispatch of '%s' (pos %d) yields %d\n", exten, pos, res);
 				if (res < 0)
 					break;
 				else if (res & RES_UPONE)
@@ -1201,7 +1209,8 @@
 					if (!maxretries)
 						maxretries = 3;
 					if ((maxretries > 0) && (retries >= maxretries)) {
-						ast_log(LOG_DEBUG, "Max retries %d exceeded\n", maxretries);
+						if (option_debug)
+							ast_log(LOG_DEBUG, "Max retries %d exceeded\n", maxretries);
 						return -2;
 					} else {
 						if (option_exists(menu, "g") > -1) 
@@ -1212,24 +1221,28 @@
 					pos = 0;
 					continue;
 				} else if (res && strchr(AST_DIGIT_ANY, res)) {
-					ast_log(LOG_DEBUG, "Got start of extension, %c\n", res);
+					if (option_debug)
+						ast_log(LOG_DEBUG, "Got start of extension, %c\n", res);
 					exten[1] = '\0';
 					exten[0] = res;
 					if ((res = read_newoption(chan, menu, exten, sizeof(exten))))
 						break;
 					if (option_exists(menu, exten) < 0) {
 						if (option_exists(menu, "i")) {
-							ast_log(LOG_DEBUG, "Invalid extension entered, going to 'i'!\n");
+							if (option_debug)
+								ast_log(LOG_DEBUG, "Invalid extension entered, going to 'i'!\n");
 							strcpy(exten, "i");
 							pos = 0;
 							continue;
 						} else {
-							ast_log(LOG_DEBUG, "Aborting on invalid entry, with no 'i' option!\n");
+							if (option_debug)
+								ast_log(LOG_DEBUG, "Aborting on invalid entry, with no 'i' option!\n");
 							res = -2;
 							break;
 						}
 					} else {
-						ast_log(LOG_DEBUG, "New existing extension: %s\n", exten);
+						if (option_debug)
+							ast_log(LOG_DEBUG, "New existing extension: %s\n", exten);
 						pos = 0;
 						continue;
 					}
@@ -1237,7 +1250,8 @@
 			}
 			pos++;
 		}
-		ast_log(LOG_DEBUG, "Stopping option '%s', res is %d\n", exten, res);
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Stopping option '%s', res is %d\n", exten, res);
 		pos = 0;
 		if (!strcasecmp(exten, "s"))
 			strcpy(exten, "g");

Modified: team/group/vldtmf_fixup/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/main/channel.c?view=diff&rev=51268&r1=51267&r2=51268
==============================================================================
--- team/group/vldtmf_fixup/main/channel.c (original)
+++ team/group/vldtmf_fixup/main/channel.c Thu Jan 18 17:04:31 2007
@@ -878,7 +878,8 @@
 			ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name);
 			CRASH;
 		} else {
-			ast_log(LOG_DEBUG, "Dropping voice to exceptionally long queue on %s\n", chan->name);
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Dropping voice to exceptionally long queue on %s\n", chan->name);
 			ast_frfree(f);
 			ast_channel_unlock(chan);
 			return 0;
@@ -1015,7 +1016,8 @@
 		/* this is slightly unsafe, as we _should_ hold the lock to access c->name */
 		done = c == NULL || ast_channel_trylock(c) == 0;
 		if (!done)
-			ast_log(LOG_DEBUG, "Avoiding %s for channel '%p'\n", msg, c);
+			if (option_debug)

[... 407 lines stripped ...]

More information about the asterisk-commits mailing list