follow the stable tree, upgrade to 2.6.16.3

[openwrt.git] / openwrt / package / snort / Config.in

diff --git a/openwrt/package/snort/Config.in b/openwrt/package/snort/Config.in
index ff79cfa..b3e9d4f 100644 (file)
--- a/openwrt/package/snort/Config.in
+++ b/openwrt/package/snort/Config.in
@@ -1,42 +1,57 @@
+menu "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
+
+config BR2_COMPILE_SNORT
+       tristate
+       default n
+       depends BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM
+
 choice
-       prompt "snort - Ligthweight Network Intrusion Detection System (NIDS)"
+       prompt "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
        tristate
        optional
-       default m if CONFIG_DEVEL
        help
+         
          A ligthweight Network Intrusion Detection System (NIDS)
          
          http://www.snort.org/
          
-         Depends: libnet, libpcap, libpcre
-         
+         Depends: 
+           - libmysqlclient (for MySQL database logging support)
+           - libnet
+           - libpcap
+           - libpcre
+           - libpq (for PostgreSQL database logging support)
        
        config BR2_PACKAGE_SNORT_BASIC
-               prompt "snort: without database support"
+               prompt   "snort...........................   without database support"
                tristate
+               select BR2_COMPILE_SNORT
                select BR2_PACKAGE_LIBNET
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPCRE
        
        config BR2_PACKAGE_SNORT_MYSQL
-               prompt "snort-mysql: with MySQL database support"
+               prompt   "snort-mysql.....................   with MySQL database support"
                tristate
+               select BR2_COMPILE_SNORT
                select BR2_PACKAGE_LIBNET
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPCRE
                select BR2_PACKAGE_LIBMYSQLCLIENT
        
        config BR2_PACKAGE_SNORT_PGSQL
-               prompt "snort-pgsql: with PostgreSQL database support"
+               prompt   "snort-pgsql.....................   with PostgreSQL database support"
                tristate
+               select BR2_COMPILE_SNORT
                select BR2_PACKAGE_LIBNET
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPCRE
                select BR2_PACKAGE_LIBPQ
        
        config BR2_PACKAGE_SNORT_CUSTOM
-               prompt "snort-custom: customized to your needs"
+               prompt   "snort-custom....................   customized to your needs"
                tristate
+               select BR2_COMPILE_SNORT
                select BR2_PACKAGE_LIBNET
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPCRE
@@ -48,7 +63,7 @@ choice
                depends BR2_PACKAGE_SNORT_CUSTOM
 
        config BR2_PACKAGE_SNORT_ENABLE_INLINE
-               prompt "inline mode (read packets from iptables instead of libpcap)"
+               prompt "Inline mode (read packets from iptables instead of libpcap)"
                bool
                default n
                depends BR2_PACKAGE_SNORT_CUSTOM
@@ -70,6 +85,4 @@ choice
 
 endchoice
 
-config BR2_PACKAGE_SNORT
-       tristate
-       default BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM
+endmenu