From 8b3e261fa9909fa2d32cbe38d1ba4933d742a1d6 Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Sun, 17 Jun 2012 16:28:30 +0000
Subject: [PATCH] freecwmp: should fix defconfig issue

SVN-Revision: 32410
---
 utils/freecwmp/Config-zstream.in             | 27 --------------------
 utils/freecwmp/{Config-curl.in => Config.in} |  5 ++--
 utils/freecwmp/Makefile                      | 15 ++++-------
 3 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 utils/freecwmp/Config-zstream.in
 rename utils/freecwmp/{Config-curl.in => Config.in} (86%)

diff --git a/utils/freecwmp/Config-zstream.in b/utils/freecwmp/Config-zstream.in
deleted file mode 100644
index 465bfaab9..000000000
--- a/utils/freecwmp/Config-zstream.in
+++ /dev/null
@@ -1,27 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_freecwmp-zstream
-
-config FREECWMP_SCRIPTS_FULL
-	bool "Install all freecwmp scripts"
-	default y
-
-choice
-	prompt "Select ACS sever"
-	default FREECWMP_ACS_MULTI
-
-config FREECWMP_ACS_MULTI
-	bool "No specific ACS, follow standard"
-
-config FREECWMP_ACS_HDM
-	bool "HDM"
-endchoice
-
-config FREECWMP_DEBUG
-	bool "Compile with debug options"
-	default n
-
-config FREECWMP_DEVEL_DEBUG
-	bool "Compile with development debug options"
-	default n
-
-endmenu
diff --git a/utils/freecwmp/Config-curl.in b/utils/freecwmp/Config.in
similarity index 86%
rename from utils/freecwmp/Config-curl.in
rename to utils/freecwmp/Config.in
index baff2ef6d..95f358329 100644
--- a/utils/freecwmp/Config-curl.in
+++ b/utils/freecwmp/Config.in
@@ -1,5 +1,4 @@
-menu "Configuration"
-	depends on PACKAGE_freecwmp-curl
+if PACKAGE_freecwmp-curl || PACKAGE_freecwmp-zstream
 
 config FREECWMP_SCRIPTS_FULL
 	bool "Install all freecwmp scripts"
@@ -24,4 +23,4 @@ config FREECWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
 
-endmenu
+endif
diff --git a/utils/freecwmp/Makefile b/utils/freecwmp/Makefile
index 9d2a85b63..48acd3cef 100644
--- a/utils/freecwmp/Makefile
+++ b/utils/freecwmp/Makefile
@@ -33,8 +33,7 @@ define Package/freecwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libubox +libmicroxml +shflags @BROKEN
-  MENU:=1
+  DEPENDS:=+libuci +libubox +libmicroxml +shflags
 endef
 
 define Package/freecwmp/description
@@ -44,23 +43,19 @@ endef
 define Package/freecwmp-curl
   $(call Package/freecwmp/Default)
   TITLE+= (using libcurl)
-  DEPENDS += +libcurl
+  DEPENDS+= +libcurl
   VARIANT:=curl
 endef
 
 define Package/freecwmp-zstream
   $(call Package/freecwmp/Default)
-  TITLE += (using libzstream)
-  DEPENDS += +libzstream
+  TITLE+= (using libzstream)
+  DEPENDS+= +libzstream
   VARIANT:=zstream
 endef
 
-define Package/freecwmp-curl/config
-	source "$(SOURCE)/Config-curl.in"
-endef
-
 define Package/freecwmp-zstream/config
-	source "$(SOURCE)/Config-zstream.in"
+	source "$(SOURCE)/Config.in"
 endef
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-- 
2.30.2