[Asterisk-cvs] asterisk/res res_agi.c, 1.37, 1.38 res_crypto.c, 1.20, 1.21 res_monitor.c, 1.34, 1.35 res_musiconhold.c, 1.59, 1.60

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv5101/res

Modified Files:
	res_agi.c res_crypto.c res_monitor.c res_musiconhold.c 
Log Message:
major Makefile and build process improvements, including removal of all hardcoded paths (modules must now use run-time paths as they should) (bug #4116)


Index: res_agi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_agi.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- res_agi.c	6 Jun 2005 02:29:18 -0000	1.37
+++ res_agi.c	6 Jun 2005 03:04:58 -0000	1.38
@@ -47,7 +47,6 @@
 #include "asterisk/lock.h"
 #include "asterisk/agi.h"
 #include "asterisk.h"
-#include "astconf.h"
 #ifdef SOLARIS
 #include "asterisk/astmm.h"
 #endif

Index: res_crypto.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_crypto.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- res_crypto.c	21 Apr 2005 06:02:44 -0000	1.20
+++ res_crypto.c	6 Jun 2005 03:04:58 -0000	1.21
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include "asterisk.h"
-#include "astconf.h"
 
 /*
  * Asterisk uses RSA keys with SHA-1 message digests for its

Index: res_monitor.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_monitor.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- res_monitor.c	6 Jun 2005 02:29:18 -0000	1.34
+++ res_monitor.c	6 Jun 2005 03:04:58 -0000	1.35
@@ -19,9 +19,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/config.h"
 #include "asterisk.h"
-#include "astconf.h"
-
-#define AST_MONITOR_DIR	AST_SPOOL_DIR "/monitor"
 
 AST_MUTEX_DEFINE_STATIC(monitorlock);
 
@@ -83,7 +80,7 @@
 		char *channel_name, *p;
 
 		/* Create monitoring directory if needed */
-		if (mkdir(AST_MONITOR_DIR, 0770) < 0) {
+		if (mkdir(ast_config_AST_MONITOR_DIR, 0770) < 0) {
 			if (errno != EEXIST) {
 				ast_log(LOG_WARNING, "Unable to create audio monitor directory: %s\n",
 					strerror(errno));
@@ -109,16 +106,16 @@
 				ast_safe_system(tmp);
 			}
 			snprintf(monitor->read_filename, FILENAME_MAX, "%s/%s-in",
-						directory ? "" : AST_MONITOR_DIR, fname_base);
+						directory ? "" : ast_config_AST_MONITOR_DIR, fname_base);
 			snprintf(monitor->write_filename, FILENAME_MAX, "%s/%s-out",
-						directory ? "" : AST_MONITOR_DIR, fname_base);
+						directory ? "" : ast_config_AST_MONITOR_DIR, fname_base);
 			strncpy(monitor->filename_base, fname_base, sizeof(monitor->filename_base) - 1);
 		} else {
 			ast_mutex_lock(&monitorlock);
 			snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%ld",
-						AST_MONITOR_DIR, seq);
+						ast_config_AST_MONITOR_DIR, seq);
 			snprintf(monitor->write_filename, FILENAME_MAX, "%s/audio-out-%ld",
-						AST_MONITOR_DIR, seq);
+						ast_config_AST_MONITOR_DIR, seq);
 			seq++;
 			ast_mutex_unlock(&monitorlock);
 
@@ -127,7 +124,7 @@
 					*p = '-';
 				}
 				snprintf(monitor->filename_base, FILENAME_MAX, "%s/%ld-%s",
-						 AST_MONITOR_DIR, time(NULL),channel_name);
+						 ast_config_AST_MONITOR_DIR, time(NULL),channel_name);
 				monitor->filename_changed = 1;
 			} else {
 				ast_log(LOG_ERROR,"Failed to allocate Memory\n");
@@ -236,7 +233,7 @@
 			char *format = !strcasecmp(chan->monitor->format,"wav49") ? "WAV" : chan->monitor->format;
 			char *name = chan->monitor->filename_base;
 			int directory = strchr(name, '/') ? 1 : 0;
-			char *dir = directory ? "" : AST_MONITOR_DIR;
+			char *dir = directory ? "" : ast_config_AST_MONITOR_DIR;
 
 			/* Set the execute application */
 			execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC");
@@ -295,7 +292,7 @@
 			ast_safe_system(tmp);
 		}
 
-		snprintf(chan->monitor->filename_base, FILENAME_MAX, "%s/%s", directory ? "" : AST_MONITOR_DIR, fname_base);
+		snprintf(chan->monitor->filename_base, FILENAME_MAX, "%s/%s", directory ? "" : ast_config_AST_MONITOR_DIR, fname_base);
 	} else {
 		ast_log(LOG_WARNING, "Cannot change monitor filename of channel %s to %s, monitoring not started\n", chan->name, fname_base);
 	}

Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- res_musiconhold.c	6 Jun 2005 02:29:18 -0000	1.59
+++ res_musiconhold.c	6 Jun 2005 03:04:58 -0000	1.60
@@ -16,7 +16,6 @@
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "astconf.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"