summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--config.in8
-rw-r--r--libopie/config.in4
-rw-r--r--libopie2/config.in7
3 files changed, 11 insertions, 8 deletions
diff --git a/config.in b/config.in
index 1a5b53b..e0255d6 100644
--- a/config.in
+++ b/config.in
@@ -150,11 +150,14 @@ menu "Base"
source x11/config.in
endchoice
source libopie/config.in
+
+ source libopie2/config.in
+ source libqtaux/config.in
+
source core/opie-login/config.in
source core/opiealarm/config.in
source core/tools/quicklauncher/config.in
source core/launcher/config.in
- source core/qws/config.in
source core/symlinker/config.in
endmenu
@@ -233,9 +236,8 @@ comment ""
depends on EXPERIMENTAL
menu "Experimental"
depends on EXPERIMENTAL
- source libopie2/config.in
- source libqtaux/config.in
source libslcompat/config.in
+ source core/qws/config.in
config SQL_PIM_BACKEND
bool "Add SQL-Backend support"
diff --git a/libopie/config.in b/libopie/config.in
index 3dcae4d..945a5c3 100644
--- a/libopie/config.in
+++ b/libopie/config.in
@@ -1,4 +1,4 @@
config LIBOPIE
- boolean "Opie library"
- default "y"
+ boolean "libopie1 (compatibility only, use libopie2* for new applications)"
+ default "n"
depends LIBQPE || LIBQPE-X11 || LIBOPIE2DB
diff --git a/libopie2/config.in b/libopie2/config.in
index 5a0e443..ddbe807 100644
--- a/libopie2/config.in
+++ b/libopie2/config.in
@@ -1,11 +1,12 @@
-menu "libopie2"
+#menu "libopie2"
+ comment ""
source libopie2/opiecore/config.in
source libopie2/opiedb/config.in
source libopie2/opienet/config.in
source libopie2/opiepim/config.in
source libopie2/opieui/config.in
source libopie2/opiemm/config.in
- comment ""
source libopie2/examples/config.in
-endmenu
+ comment ""
+#endmenu