rename "parking" to "features" in preparation for some more (possibly post 1.0) feature additions

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-07-17 20:58:01 +00:00
parent ab7cd94b60
commit 569b95352a
13 changed files with 19 additions and 12 deletions

View File

@@ -11,7 +11,7 @@
# the GNU General Public License
#
MODS=res_adsi.so res_parking.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \
MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \
res_agi.so
MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
@@ -31,7 +31,9 @@ OSPLIB=/usr/lib/libosp.a
all: depend $(MODS)
install: all
rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so
rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
res_crypto.so: res_crypto.o

View File

@@ -21,7 +21,7 @@
#include <asterisk/translate.h>
#include <asterisk/say.h>
#include <asterisk/channel_pvt.h>
#include <asterisk/parking.h>
#include <asterisk/features.h>
#include <asterisk/musiconhold.h>
#include <asterisk/config.h>
#include <asterisk/cli.h>
@@ -697,7 +697,12 @@ int load_module(void)
ast_cli_register(&showparked);
cfg = ast_load("parking.conf");
cfg = ast_load("features.conf");
if (!cfg) {
cfg = ast_load("parking.conf");
if (cfg)
ast_log(LOG_NOTICE, "parking.conf is deprecated in favor of 'features.conf'. Please rename it.\n");
}
if (cfg) {
var = ast_variable_browse(cfg, "general");
while(var) {