Update of /usr/cvsroot/asterisk/include
In directory mongoose.digium.com:/tmp/cvs-serv5101/include
Modified Files:
asterisk.h
Removed Files:
astconf.h
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: asterisk.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- asterisk.h 21 Apr 2005 06:02:44 -0000 1.1
+++ asterisk.h 6 Jun 2005 03:04:58 -0000 1.2
@@ -17,23 +17,21 @@
#define DEFAULT_LANGUAGE "en"
#define AST_CONFIG_MAX_PATH 255
-#define AST_CONFIG_DIR ASTETCDIR
-#define AST_RUN_DIR ASTVARRUNDIR
-#define AST_SOCKET ASTVARRUNDIR "/asterisk.ctl"
-#define AST_PID ASTVARRUNDIR "/asterisk.pid"
-#define AST_MODULE_DIR ASTMODDIR
-#define AST_SPOOL_DIR ASTSPOOLDIR
-#define AST_VAR_DIR ASTVARLIBDIR
-#define AST_LOG_DIR ASTLOGDIR
-#define AST_AGI_DIR ASTAGIDIR
-#define AST_KEY_DIR ASTVARLIBDIR "/keys"
-#define AST_DB ASTVARLIBDIR "/astdb"
-#define AST_TMP_DIR ASTSPOOLDIR "/tmp"
-#define AST_CONFIG_FILE ASTCONFPATH
-
-#define AST_SOUNDS AST_VAR_DIR "/sounds"
-#define AST_IMAGES AST_VAR_DIR "/images"
+/* provided in asterisk.c */
+extern char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_CONFIG_FILE[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_MODULE_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_KEY_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_PID[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_SOCKET[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_RUN_DIR[AST_CONFIG_MAX_PATH];
/* Provided by module.c */
extern int load_modules(void);
--- astconf.h DELETED ---
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
