Updated to latest upstream version, remove uneeded patch as it is now in dnsmasq...

[openwrt.git] / openwrt / package / net-snmp / Config.in

diff --git a/openwrt/package/net-snmp/Config.in b/openwrt/package/net-snmp/Config.in
index 7e1b3b5..e0a6d03 100644 (file)
--- a/openwrt/package/net-snmp/Config.in
+++ b/openwrt/package/net-snmp/Config.in
@@ -1,15 +1,15 @@
-menu "net-snmp - Open source SNMP (Simple Network Management Protocol) implementation"
+menu "net-snmp.......................... Open source SNMP (Simple Network Management Protocol) implementation"

 
 

-config BR2_PACKAGE_NET_SNMP
-       bool
+config BR2_COMPILE_NET_SNMP
+       tristate

        default n
        default n

-       depends BR2_PACKAGE_LIBNETSNMP
+       depends BR2_PACKAGE_LIBNETSNMP || BR2_PACKAGE_SNMPD_STATIC

 
 config BR2_PACKAGE_LIBNETSNMP
 
 config BR2_PACKAGE_LIBNETSNMP

-       prompt "libnetsnmp - SNMP shared libraries"
+       prompt "libnetsnmp........................ SNMP shared libraries"

        tristate
        default m if CONFIG_DEVEL
        tristate
        default m if CONFIG_DEVEL

-       select BR2_PACKAGE_NET_SNMP
+       select BR2_COMPILE_NET_SNMP

        select BR2_PACKAGE_LIBELF
        help
          Simple Network Management Protocol (SNMP) is a widely used 
        select BR2_PACKAGE_LIBELF
        help
          Simple Network Management Protocol (SNMP) is a widely used 


@@ -21,13 +21,29 @@ config BR2_PACKAGE_LIBNETSNMP
          http://www.net-snmp.org/
          
          This package contains shared libraries, needed by other programs.
          http://www.net-snmp.org/
          
          This package contains shared libraries, needed by other programs.

+
+config BR2_PACKAGE_SNMP_UTILS
+       prompt   "snmp-utils...................... SNMP client utilities"
+       tristate
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_LIBNETSNMP
+       help
+         Simple Network Management Protocol (SNMP) is a widely used 
+         protocol for monitoring the health and welfare of network 
+         equipment (eg. routers), computer equipment and even devices 
+         like UPSs. Net-SNMP is a suite of applications used to implement 
+         SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6.
+         
+         http://www.net-snmp.org/

          
          

+         This package contains the SNMP client utilities.

 
 config BR2_PACKAGE_SNMPD
 
 config BR2_PACKAGE_SNMPD

-       prompt "snmpd - SNMP agent"
+       prompt "snmpd............................. SNMP agent"

        tristate
        tristate

-       select BR2_PACKAGE_LIBNETSNMP

        default m if CONFIG_DEVEL
        default m if CONFIG_DEVEL

+       select BR2_COMPILE_NET_SNMP
+       select BR2_PACKAGE_LIBNETSNMP

        help
          Simple Network Management Protocol (SNMP) is a widely used 
          protocol for monitoring the health and welfare of network 
        help
          Simple Network Management Protocol (SNMP) is a widely used 
          protocol for monitoring the health and welfare of network 


@@ -37,14 +53,14 @@ config BR2_PACKAGE_SNMPD
          
          http://www.net-snmp.org/
          
          
          http://www.net-snmp.org/
          

-         This package contains the SNMP agent.
-         
+         This package contains the SNMP agent, dynamically linked.

 
 

-config BR2_PACKAGE_SNMP_UTILS
-       prompt "snmp-utils - SNMP client utilities"
+config BR2_PACKAGE_SNMPD_STATIC
+       prompt "snmpd-static...................... SNMP agent (statically linked)"

        tristate
        tristate

-       select BR2_PACKAGE_LIBNETSNMP

        default m if CONFIG_DEVEL
        default m if CONFIG_DEVEL

+       select BR2_COMPILE_NET_SNMP
+       select BR2_PACKAGE_LIBELF

        help
          Simple Network Management Protocol (SNMP) is a widely used 
          protocol for monitoring the health and welfare of network 
        help
          Simple Network Management Protocol (SNMP) is a widely used 
          protocol for monitoring the health and welfare of network 


@@ -54,7 +70,6 @@ config BR2_PACKAGE_SNMP_UTILS
          
          http://www.net-snmp.org/
          
          
          http://www.net-snmp.org/
          

-         This package contains the SNMP client utilities.
-         
+         This package contains the SNMP agent, statically linked.

 
 endmenu
 
 endmenu