Change recent patch to not use a hard coded path inside of a .c file

[asterisk/asterisk.git] / asterisk.h

diff --git a/asterisk.h b/asterisk.h
index 1a03b9f..08fc295 100755 (executable)
--- a/asterisk.h
+++ b/asterisk.h
@@ -16,16 +16,24 @@
 
 #define DEFAULT_LANGUAGE "en"
 
 
 #define DEFAULT_LANGUAGE "en"
 

-#define AST_CONFIG_DIR "/etc/asterisk"
-#define AST_SOCKET             "/var/run/asterisk.ctl"
-#define AST_MODULE_DIR "/usr/lib/asterisk/modules"
-#define AST_SPOOL_DIR  "/var/spool/asterisk"
-#define AST_VAR_DIR    "/var/lib/asterisk"
-#define AST_LOG_DIR       "/var/log/asterisk"
+#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 "asterisk.conf"
+#define AST_CONFIG_FILE ASTCONFPATH

 
 #define AST_SOUNDS AST_VAR_DIR "/sounds"
 
 #define AST_SOUNDS AST_VAR_DIR "/sounds"

+#define AST_IMAGES AST_VAR_DIR "/images"

 
 /* Provided by module.c */
 extern int load_modules(void);
 
 /* Provided by module.c */
 extern int load_modules(void);

@@ -33,5 +41,14 @@ extern int load_modules(void);
 extern int load_pbx(void);
 /* Provided by logger.c */
 extern int init_logger(void);
 extern int load_pbx(void);
 /* Provided by logger.c */
 extern int init_logger(void);

+extern void close_logger(void);
+/* Provided by frame.c */
+extern int init_framer(void);
+/* Provided by logger.c */
+extern int reload_logger(int);
+/* Provided by term.c */
+extern int term_init(void);
+/* Provided by db.c */
+extern int astdb_init(void);

 
 #endif
 
 #endif