diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-06 03:04:58 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-06 03:04:58 +0000 |
commit | e5006737913cf0182a428bea5fe509001aa4e98f (patch) | |
tree | 58d7e6695d5101aec3937aa27bc051e769ae3bbc /res | |
parent | 42b7c567777aacf352bdf359cd7b27e8f1a644a9 (diff) |
major Makefile and build process improvements, including removal of all hardcoded paths (modules must now use run-time paths as they should) (bug #4116)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5855 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rwxr-xr-x | res/res_agi.c | 1 | ||||
-rwxr-xr-x | res/res_crypto.c | 1 | ||||
-rwxr-xr-x | res/res_monitor.c | 19 | ||||
-rwxr-xr-x | res/res_musiconhold.c | 1 |
4 files changed, 8 insertions, 14 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index f1837b5f0..726c54951 100755 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -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 diff --git a/res/res_crypto.c b/res/res_crypto.c index 13e4c2dbc..0ca1b9e11 100755 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -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 diff --git a/res/res_monitor.c b/res/res_monitor.c index 62d35dd1d..1053e9aea 100755 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -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 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec, 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 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec, 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 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec, *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 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock) 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 @@ int ast_monitor_change_fname(struct ast_channel *chan, const char *fname_base, i 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); } diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 3b8c5b098..33609c442 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -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" |