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

13 files changed, 19 insertions, 12 deletions

diff --git a/apps/app_dial.c b/apps/app_dial.c
index d44de7034..43ff0c30d 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -21,7 +21,7 @@
 #include <asterisk/translate.h>
 #include <asterisk/say.h>
 #include <asterisk/config.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/callerid.h>
 #include <asterisk/utils.h>
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index 2faa92dc1..c3f949ec3 100755
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -21,7 +21,7 @@
 #include <asterisk/channel_pvt.h>
 #include <asterisk/pbx.h>
 #include <asterisk/module.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/options.h>
 #include <asterisk/logger.h>
 #include <asterisk/say.h>
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 45690fd56..6fe9f6d4a 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -38,7 +38,7 @@
 #include <asterisk/module.h>
 #include <asterisk/translate.h>
 #include <asterisk/say.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/cli.h>
 #include <asterisk/manager.h>
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index bf71e9aab..6371e0727 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -32,7 +32,7 @@
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/manager.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/utils.h>
 #include <sys/socket.h>
 #include <errno.h>
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 53e28c866..58945b711 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -33,7 +33,7 @@
 #include <asterisk/app.h>
 #include <asterisk/astdb.h>
 #include <asterisk/musiconhold.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/utils.h>
 #include <sys/mman.h>
 #include <arpa/inet.h>
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 61391a7fb..67e9081e4 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -68,7 +68,7 @@
 #include <asterisk/say.h>
 #include <asterisk/cdr.h>
 #include <asterisk/astdb.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/utils.h>
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 47d229eb6..9a3105da5 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -34,7 +34,7 @@
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/dsp.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/acl.h>
 #include <asterisk/srv.h>
 #include <asterisk/astdb.h>
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index c624324b8..df3398dd0 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -34,7 +34,7 @@
 #include <asterisk/say.h>
 #include <asterisk/cdr.h>
 #include <asterisk/astdb.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/utils.h>
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 48e6cf2f0..d5d17f400 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -28,7 +28,7 @@
 #include <asterisk/adsi.h>
 #include <asterisk/cli.h>
 #include <asterisk/cdr.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/say.h>
 #include <asterisk/tdd.h>
diff --git a/configs/parking.conf.sample b/configs/features.conf.sample
index 20eb42747..20eb42747 100755
--- a/configs/parking.conf.sample
+++ b/configs/features.conf.sample
diff --git a/include/asterisk/parking.h b/include/asterisk/features.h
index 1e30f8ae0..1e30f8ae0 100755
--- a/include/asterisk/parking.h
+++ b/include/asterisk/features.h
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) {