6 files changed, 24 insertions, 20 deletions
diff --git a/noncore/net/networksetup/config.in b/noncore/net/networksetup/config.in
index e151d6f..0f2c878 100644
--- a/noncore/net/networksetup/config.in
+++ b/noncore/net/networksetup/config.in
@@ -1,10 +1,12 @@
-menu "networksetup"
+config NETWORKSETUP
+  boolean "Networksetup"
+  default "y"
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
-  config INTERFACES
+config NETWORKSETUP-CORE
-    boolean "networksetup"
+  boolean
-    default "y"
+  default "y" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && INTERFACES
  source noncore/net/networksetup/wlan/config.in
  source noncore/net/networksetup/interfaces/config.in
-endmenu
diff --git a/noncore/net/networksetup/interfaces/config.in b/noncore/net/networksetup/interfaces/config.in
index b9873f7..c379ad0 100644
--- a/noncore/net/networksetup/interfaces/config.in
+++ b/noncore/net/networksetup/interfaces/config.in
@@ -1,4 +1,4 @@
  config INTERFACES
    boolean "interfaces"
-    default "y"
+    default "y" if NETWORKSETUP
    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/networksetup/wlan/config.in b/noncore/net/networksetup/wlan/config.in
index 7f552fc..36ced3a 100644
--- a/noncore/net/networksetup/wlan/config.in
+++ b/noncore/net/networksetup/wlan/config.in
@@ -1,4 +1,4 @@
  config WLAN
-    boolean "wlan"
+    boolean "Wireless LAN Module"
-    default "y"
+    default "y" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES
diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in
index e151d6f..0f2c878 100644
--- a/noncore/settings/networksettings/config.in
+++ b/noncore/settings/networksettings/config.in
@@ -1,10 +1,12 @@
-menu "networksetup"
+config NETWORKSETUP
+  boolean "Networksetup"
+  default "y"
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
-  config INTERFACES
+config NETWORKSETUP-CORE
-    boolean "networksetup"
+  boolean
-    default "y"
+  default "y" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && INTERFACES
  source noncore/net/networksetup/wlan/config.in
  source noncore/net/networksetup/interfaces/config.in
-endmenu
diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in
index b9873f7..c379ad0 100644
--- a/noncore/settings/networksettings/interfaces/config.in
+++ b/noncore/settings/networksettings/interfaces/config.in
@@ -1,4 +1,4 @@
  config INTERFACES
    boolean "interfaces"
-    default "y"
+    default "y" if NETWORKSETUP
    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index 7f552fc..36ced3a 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -1,4 +1,4 @@
  config WLAN
-    boolean "wlan"
+    boolean "Wireless LAN Module"
-    default "y"
+    default "y" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES

diff --git a/noncore/net/networksetup/config.in b/noncore/net/networksetup/config.in index e151d6f..0f2c878 100644 --- a/noncore/net/networksetup/config.in +++ b/noncore/net/networksetup/config.in
@@ -1,10 +1,12 @@
1	menu "networksetup"	1	config NETWORKSETUP
		2	boolean "Networksetup"
		3	default "y"
		4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE
2		5
3	config INTERFACES	6	config NETWORKSETUP-CORE
4	boolean "networksetup"	7	boolean
5	default "y"	8	default "y" if NETWORKSETUP
6	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES	9	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && INTERFACES
7		10
8	source noncore/net/networksetup/wlan/config.in	11	source noncore/net/networksetup/wlan/config.in
9	source noncore/net/networksetup/interfaces/config.in	12	source noncore/net/networksetup/interfaces/config.in
10	endmenu


diff --git a/noncore/net/networksetup/interfaces/config.in b/noncore/net/networksetup/interfaces/config.in index b9873f7..c379ad0 100644 --- a/noncore/net/networksetup/interfaces/config.in +++ b/noncore/net/networksetup/interfaces/config.in
@@ -1,4 +1,4 @@
1	config INTERFACES	1	config INTERFACES
2	boolean "interfaces"	2	boolean "interfaces"
3	default "y"	3	default "y" if NETWORKSETUP
4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE	4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE


diff --git a/noncore/net/networksetup/wlan/config.in b/noncore/net/networksetup/wlan/config.in index 7f552fc..36ced3a 100644 --- a/noncore/net/networksetup/wlan/config.in +++ b/noncore/net/networksetup/wlan/config.in
@@ -1,4 +1,4 @@
1	config WLAN	1	config WLAN
2	boolean "wlan"	2	boolean "Wireless LAN Module"
3	default "y"	3	default "y" if NETWORKSETUP
4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE	4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES


diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in index e151d6f..0f2c878 100644 --- a/noncore/settings/networksettings/config.in +++ b/noncore/settings/networksettings/config.in
@@ -1,10 +1,12 @@
1	menu "networksetup"	1	config NETWORKSETUP
		2	boolean "Networksetup"
		3	default "y"
		4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE
2		5
3	config INTERFACES	6	config NETWORKSETUP-CORE
4	boolean "networksetup"	7	boolean
5	default "y"	8	default "y" if NETWORKSETUP
6	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES	9	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && INTERFACES
7		10
8	source noncore/net/networksetup/wlan/config.in	11	source noncore/net/networksetup/wlan/config.in
9	source noncore/net/networksetup/interfaces/config.in	12	source noncore/net/networksetup/interfaces/config.in
10	endmenu


diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in index b9873f7..c379ad0 100644 --- a/noncore/settings/networksettings/interfaces/config.in +++ b/noncore/settings/networksettings/interfaces/config.in
@@ -1,4 +1,4 @@
1	config INTERFACES	1	config INTERFACES
2	boolean "interfaces"	2	boolean "interfaces"
3	default "y"	3	default "y" if NETWORKSETUP
4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE	4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE


diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in index 7f552fc..36ced3a 100644 --- a/noncore/settings/networksettings/wlan/config.in +++ b/noncore/settings/networksettings/wlan/config.in
@@ -1,4 +1,4 @@
1	config WLAN	1	config WLAN
2	boolean "wlan"	2	boolean "Wireless LAN Module"
3	default "y"	3	default "y" if NETWORKSETUP
4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE	4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES