11 files changed, 12 insertions, 12 deletions
diff --git a/noncore/apps/checkbook/config.in b/noncore/apps/checkbook/config.in
index e4a3c62..61e035d 100644
--- a/noncore/apps/checkbook/config.in
+++ b/noncore/apps/checkbook/config.in
@@ -1,4 +1,4 @@
   config CHECKBOOK
     boolean "opie-checkbook (keep track of issued cheques)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/settings/aqpkg/config.in b/noncore/settings/aqpkg/config.in
index 8c2e2cf..03005ac 100644
--- a/noncore/settings/aqpkg/config.in
+++ b/noncore/settings/aqpkg/config.in
@@ -1,4 +1,4 @@
   config AQPKG
-    boolean "opie-aqpkg (a package manager)" 
+    boolean "opie-aqpkg (a package manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/settings/backup/config.in b/noncore/settings/backup/config.in
index 4ac5ba5..27a5408 100644
--- a/noncore/settings/backup/config.in
+++ b/noncore/settings/backup/config.in
@@ -1,4 +1,4 @@
   config BACKUP
     boolean "opie-backup (save and restore current Opie settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/doctab/config.in b/noncore/settings/doctab/config.in
index 5decda5..fd49457 100644
--- a/noncore/settings/doctab/config.in
+++ b/noncore/settings/doctab/config.in
@@ -1,4 +1,4 @@
   config DOCTAB
     boolean "opie-doctab (select doctab for Opie)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/language/config.in b/noncore/settings/language/config.in
index 489d11c..41925c4 100644
--- a/noncore/settings/language/config.in
+++ b/noncore/settings/language/config.in
@@ -1,4 +1,4 @@
   config LANGUAGE
     boolean "opie-language (select language for Opie)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/mediummount/config.in b/noncore/settings/mediummount/config.in
index 2ea8535..ed20a7c 100644
--- a/noncore/settings/mediummount/config.in
+++ b/noncore/settings/mediummount/config.in
@@ -1,4 +1,4 @@
   config MEDIUMMOUNT
     boolean "opie-mediummount (configuration app for medium mounter)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/packagemanager/config.in b/noncore/settings/packagemanager/config.in
index 4b47e65..978c45c 100644
--- a/noncore/settings/packagemanager/config.in
+++ b/noncore/settings/packagemanager/config.in
@@ -1,4 +1,4 @@
   config PACKAGEMANAGER
     boolean "opie-packagemanager (package management client)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/settings/sound/config.in b/noncore/settings/sound/config.in
index febb0be..a47099b 100644
--- a/noncore/settings/sound/config.in
+++ b/noncore/settings/sound/config.in
@@ -1,4 +1,4 @@
   config SOUND
     boolean "opie-vmemo-settings (control sound settings for the vmemo app)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/sshkeys/config.in b/noncore/settings/sshkeys/config.in
index bc39ceb..37d8c5b 100644
--- a/noncore/settings/sshkeys/config.in
+++ b/noncore/settings/sshkeys/config.in
@@ -1,4 +1,4 @@
   config SSHKEYS
     boolean "opie-sshkeys (manage ssh-agent keys)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/sysinfo/config.in b/noncore/settings/sysinfo/config.in
index 4d5507c..349dbdc 100644
--- a/noncore/settings/sysinfo/config.in
+++ b/noncore/settings/sysinfo/config.in
@@ -1,4 +1,4 @@
   config SYSINFO
     boolean "opie-sysinfo (System Information dialog)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/settings/usermanager/config.in b/noncore/settings/usermanager/config.in
index 90dcc05..b1071e7 100644
--- a/noncore/settings/usermanager/config.in
+++ b/noncore/settings/usermanager/config.in
@@ -1,4 +1,4 @@
   config USERMANAGER
     boolean "opie-usermanager (User/Group manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI