fix broken openser menuconfig and package template call

SVN-Revision: 3409

diff --git a/openwrt/package/openser/Config.in b/openwrt/package/openser/Config.in
index 4927d921e678dcb7c99055cec9f577f4ca632a57..6d89ec800ef1795edc789e34ef4e2df8157def80 100644 (file)
--- a/openwrt/package/openser/Config.in
+++ b/openwrt/package/openser/Config.in
@@ -1,210 +1,238 @@
 menu "openser - Configurable, free SIP server"
 
 config BR2_PACKAGE_OPENSER
-       tristate "openser - Configurable, free SIP server"
+       prompt "openser - Configurable, free SIP server"
+       tristate
        default m if CONFIG_DEVEL
        help
         Open SIP Express Router (OpenSER) is a high-performance,
         configurable, free SIP server.
 
 config BR2_PACKAGE_OPENSER_MOD_AUTH
-       tristate "openser-mod-auth - Authentication support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-auth - Authentication support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        help
          Enable authentication support
 
 config BR2_PACKAGE_OPENSER_MOD_AUTH_DB
-       tristate "openser-mod-auth-db - Authentication with database support"
-       default m
-       select BR2_PACKAGE_OPENSER
-       select BR2_PACKAGE_OPENSER_MOD_AUTH
+       prompt "openser-mod-auth-db - Authentication with database support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER_MOD_AUTH
        help
          Enable authentication with database support
 
 config BR2_PACKAGE_OPENSER_MOD_AUTH_RADIUS
-       tristate "openser-mod-auth-radius - Authentication with RADIUS support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-auth-radius - Authentication with RADIUS support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER_MOD_AUTH
        select BR2_PACKAGE_LIBRADIUSCLIENT_NG
        help
          Authentication against RADIUS
 
 config BR2_PACKAGE_OPENSER_MOD_AVP_RADIUS
-        tristate "openser-mod-avp-radius - AVP with RADIUS support"
-        default m
-        select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-avp-radius - AVP with RADIUS support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        select BR2_PACKAGE_LIBRADIUSCLIENT_NG
-        help
-          Enable AVP with RADIUS support
+       help
+         Enable AVP with RADIUS support
 
 config BR2_PACKAGE_OPENSER_MOD_AVPOPS
-       tristate "openser-mod-avpops - AVP options support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-avpops - AVP options support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        help
          Enable AVP options support
 
 config BR2_PACKAGE_OPENSER_MOD_DISPATCHER
-        tristate "openser-mod-dispatcher - dispatcher support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable dispatcher options support
+       prompt "openser-mod-dispatcher - dispatcher support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable dispatcher options support
 
 config BR2_PACKAGE_OPENSER_MOD_DIVERSION
-        tristate "openser-mod-diversion - diversion support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable diversion options support
+       prompt "openser-mod-diversion - diversion support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable diversion options support
 
 config BR2_PACKAGE_OPENSER_MOD_FLATSTORE
-        tristate "openser-mod-flatstore - flatstore support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable flatstore support
+       prompt "openser-mod-flatstore - flatstore support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable flatstore support
 
 config BR2_PACKAGE_OPENSER_MOD_GFLAGS
-        tristate "openser-mod-gflags - gflags support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable GFlags support
+       prompt "openser-mod-gflags - gflags support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable GFlags support
 
 config BR2_PACKAGE_OPENSER_MOD_GROUP
-        tristate "openser-mod-group - group support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable group support
+       prompt "openser-mod-group - group support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable group support
 
 config BR2_PACKAGE_OPENSER_MOD_GROUP_RADIUS
-        tristate "openser-mod-group-radius - group with RADIUS support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable group with RADIUS support
+       prompt "openser-mod-group-radius - group with RADIUS support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable group with RADIUS support
 
 config BR2_PACKAGE_OPENSER_MOD_LCR
-        tristate "openser-mod-lcr - Least Cost Routing support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        select BR2_PACKAGE_OPENSER_MOD_MYSQL
-        help
-          Enable Least Cost Routing support
+       prompt "openser-mod-lcr - Least Cost Routing support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       select BR2_PACKAGE_OPENSER_MOD_MYSQL
+       help
+         Enable Least Cost Routing support
 
 config BR2_PACKAGE_OPENSER_MOD_MEDIAPROXY
-       tristate "openser-mod-mediaproxy - Mediaproxy support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-mediaproxy - Mediaproxy support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        help
          Enable mediaproxy support
 
 config BR2_PACKAGE_OPENSER_MOD_MSILO
-        tristate "openser-mod-msilo - MSilo support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable msilo support
+       prompt "openser-mod-msilo - MSilo support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable msilo support
 
 config BR2_PACKAGE_OPENSER_MOD_MYSQL
-        tristate "openser-mod-mysql - MySQL support"
-        default m
-        select BR2_PACKAGE_LIBMYSQLCLIENT
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable MySQL support
+       prompt "openser-mod-mysql - MySQL support"
+       tristate
+       default m if CONFIG_DEVEL
+       select BR2_PACKAGE_LIBMYSQLCLIENT
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable MySQL support
 
 config BR2_PACKAGE_OPENSER_MOD_NATHELPER
-       tristate "openser-mod-nathelper - NAT helper support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-nathelper - NAT helper support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        help
          NAT helper support
 
 config BR2_PACKAGE_OPENSER_MOD_OPTIONS
-        tristate "openser-mod-options - options support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable options support
+       prompt "openser-mod-options - options support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable options support
 
 config BR2_PACKAGE_OPENSER_MOD_PDT
-        tristate "openser-mod-pdt - PDT support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable pdt support
+       prompt "openser-mod-pdt - PDT support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable pdt support
 
 config BR2_PACKAGE_OPENSER_MOD_PERMISSIONS
-        tristate "openser-mod-permissions - Permissions support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable permissions support
+       prompt "openser-mod-permissions - Permissions support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable permissions support
 
 config BR2_PACKAGE_OPENSER_MOD_PIKE
-        tristate "openser-mod-pike - PIKE support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable pike support
+       prompt "openser-mod-pike - PIKE support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable pike support
 
 config BR2_PACKAGE_OPENSER_MOD_SMS
-       tristate "openser-mod-sms - SMS support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-sms - SMS support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        help
          SMS support
 
 config BR2_PACKAGE_OPENSER_MOD_SPEEDDIAL
-       tristate "openser-mod-speeddial - Speed dial support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-speeddial - Speed Dial support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        help
          Speed Dial support
 
 config BR2_PACKAGE_OPENSER_MOD_UAC
-        tristate "openser-mod-uac - UAC support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable UAC support
+       prompt "openser-mod-uac - UAC support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable UAC support
 
 config BR2_PACKAGE_OPENSER_MOD_UAC_REDIRECT
-        tristate "openser-mod-uac - UAC redirect support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable UAC redirect support
+       prompt "openser-mod-uac - UAC redirect support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable UAC redirect support
 
 config BR2_PACKAGE_OPENSER_MOD_URI
-        tristate "openser-mod-uri - URI support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable URI support
+       prompt "openser-mod-uri - URI support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable URI support
 
 config BR2_PACKAGE_OPENSER_MOD_URI_DB
-        tristate "openser-mod-uri-db - URI database support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable URI database support
+       prompt "openser-mod-uri-db - URI database support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable URI database support
 
 config BR2_PACKAGE_OPENSER_MOD_URI_RADIUS
-        tristate "openser-mod-uri-radius - URI with RADIUS support"
-        default m
-        select BR2_PACKAGE_OPENSER
-        help
-          Enable URI with RADIUS support
+       prompt "openser-mod-uri-radius - URI with RADIUS support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
+       help
+         Enable URI with RADIUS support
 
 config BR2_PACKAGE_OPENSER_MOD_XLOG
-       tristate "openser-mod-xlog - Logging support"
-       default m
-       select BR2_PACKAGE_OPENSER
+       prompt "openser-mod-xlog - Logging support"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_OPENSER
        help
          Logging support
 

diff --git a/openwrt/package/openser/Makefile b/openwrt/package/openser/Makefile
index 28d82dbaf30e4bb00f2b8dd51b8cc1159e30fafe..fbfc3dc8474a86ec8bb99a452ec63a86d9700193 100644 (file)
--- a/openwrt/package/openser/Makefile
+++ b/openwrt/package/openser/Makefile
@@ -57,7 +57,6 @@ $(eval $(call PKG_template,OPENSER_MOD_UAC_REDIRECT,openser-mod-uac-redirect,$(P
 $(eval $(call PKG_template,OPENSER_MOD_URI,openser-mod-uri,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,OPENSER_MOD_URI_DB,openser-mod-uri-db,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,OPENSER_MOD_URI_RADIUS,openser-mod-uri-radius,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSER_MOD_AUTH_RADIUS,openser-mod-auth-radius,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,OPENSER_MOD_XLOG,openser-mod-xlog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call PKG_mod_template,OPENSER_MOD_ACCOUNTING,acc))