diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-17 20:58:01 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-17 20:58:01 +0000 |
| commit | fc1d3d8122b037d0cee66ef016f9634646b84e6b (patch) | |
| tree | ad538b62f1284a2c28cadd57d875ca6499bf9b6d /res | |
| parent | f1c4cb12101797b4f34631a1ee124503ff3f39de (diff) | |
rename "parking" to "features" in preparation for some more (possibly post 1.0) feature additions
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3463 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rwxr-xr-x | res/Makefile | 4 | ||||
| -rwxr-xr-x | res/res_features.c (renamed from res/res_parking.c) | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/res/Makefile b/res/Makefile index afd3af937..39d079e0f 100755 --- a/res/Makefile +++ b/res/Makefile @@ -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 diff --git a/res/res_parking.c b/res/res_features.c index b7d1b22f9..b55f1be5e 100755 --- a/res/res_parking.c +++ b/res/res_features.c @@ -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) { |