backport base-files fix from whiterussian [2308],

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

diff --git a/openwrt/package/rrdtool/Config.in b/openwrt/package/rrdtool/Config.in
index 058fe4e..641e558 100644 (file)
--- a/openwrt/package/rrdtool/Config.in
+++ b/openwrt/package/rrdtool/Config.in
@@ -1,18 +1,16 @@
-menu "rrdtool - Round Robin Database (RRD) management tools and library"
-
 config BR2_COMPILE_RRDTOOL
        bool
-       default no
-       depends BR2_PACKAGE_LIBRRD || BR2_PACKAGE_RRDCGI || BR2_PACKAGE_RRDTOOL
+       default n
+       depends BR2_PACKAGE_LIBRRD
 
 config BR2_PACKAGE_LIBRRD
-       tristate "librrd - Round Robin Database (RRD) management library"
-#      default m if CONFIG_DEVEL
+       tristate "librrd - Round Robin Database (RRD) management library (v1.2.x)"
        default n
        select BR2_COMPILE_RRDTOOL
        select BR2_PACKAGE_LIBART
        select BR2_PACKAGE_LIBFREETYPE
        select BR2_PACKAGE_LIBPNG
+       select BR2_PACKAGE_ZLIB
        help
          RRD is the Acronym for Round Robin Database. RRD is a system to store and
          display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -28,12 +26,10 @@ config BR2_PACKAGE_LIBRRD
          
 
 config BR2_PACKAGE_RRDCGI
-       tristate "rrdcgi - Round Robin Database (RRD) CGI graphing tool"
-#      default m if CONFIG_DEVEL
+       tristate "rrdcgi - Round Robin Database (RRD) CGI graphing tool (v1.2.x)"
        default n
-       select BR2_COMPILE_RRDTOOL
+       depends BR2_PACKAGE_LIBRRD
        select BR2_PACKAGE_CGILIB
-       select BR2_PACKAGE_LIBRRD
        help
          RRD is the Acronym for Round Robin Database. RRD is a system to store and
          display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -50,11 +46,9 @@ config BR2_PACKAGE_RRDCGI
          
 
 config BR2_PACKAGE_RRDTOOL
-       tristate "rrdtool - Round Robin Database (RRD) management tools"
-#      default m if CONFIG_DEVEL
+       tristate "rrdtool - Round Robin Database (RRD) management tools (v1.2.x)"
        default n
-       select BR2_COMPILE_RRDTOOL
-       select BR2_PACKAGE_LIBRRD
+       depends BR2_PACKAGE_LIBRRD
        help
          RRD is the Acronym for Round Robin Database. RRD is a system to store and
          display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -69,5 +63,3 @@ config BR2_PACKAGE_RRDTOOL
          This package contains command line tools used to manage RRDs.
          
 
-endmenu
-