remove circular dependency,

disable rrdtool,
enable rrdtool1 when DEVELOPER=1

SVN-Revision: 1959

diff --git a/openwrt/package/rrdtool/Config.in b/openwrt/package/rrdtool/Config.in
index f464af23e4cf5d0b547401f59057b4d8a3bef43b..641e5585e19ac42c28b879b1002be9dd6e148f85 100644 (file)
--- a/openwrt/package/rrdtool/Config.in
+++ b/openwrt/package/rrdtool/Config.in
@@ -1,12 +1,11 @@
 config BR2_COMPILE_RRDTOOL
        bool
-       default no
+       default n
        depends BR2_PACKAGE_LIBRRD
 
 config BR2_PACKAGE_LIBRRD
        tristate "librrd - Round Robin Database (RRD) management library (v1.2.x)"
        default n
-       depends !BR2_COMPILE_RRDTOOL1
        select BR2_COMPILE_RRDTOOL
        select BR2_PACKAGE_LIBART
        select BR2_PACKAGE_LIBFREETYPE

diff --git a/openwrt/package/rrdtool1/Config.in b/openwrt/package/rrdtool1/Config.in
index 556708b676887a05cd295a068509735d84ab2d7d..1d30f8e8edeecf9b4c1d7600914962b0aa018c76 100644 (file)
--- a/openwrt/package/rrdtool1/Config.in
+++ b/openwrt/package/rrdtool1/Config.in
@@ -1,12 +1,11 @@
 config BR2_COMPILE_RRDTOOL1
        bool
-       default no
+       default n
        depends BR2_PACKAGE_LIBRRD1
 
 config BR2_PACKAGE_LIBRRD1
        tristate "librrd1 - Round Robin Database (RRD) management library (v1.0.x)"
        default m if CONFIG_DEVEL
-       depends !BR2_COMPILE_RRDTOOL
        select BR2_COMPILE_RRDTOOL1
        select BR2_PACKAGE_ZLIB
        help