summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test6
-rw-r--r--Rules.make24
-rw-r--r--core/applets/batteryapplet/config.in2
-rw-r--r--core/applets/cardmon/config.in2
-rw-r--r--core/applets/clipboardapplet/config.in2
-rw-r--r--core/applets/clockapplet/config.in2
-rw-r--r--core/applets/homeapplet/config.in2
-rw-r--r--core/applets/irdaapplet/config.in2
-rw-r--r--core/applets/logoutapplet/config.in2
-rw-r--r--core/applets/obex/config.in2
-rw-r--r--core/applets/restartapplet/config.in2
-rw-r--r--core/applets/screenshotapplet/config.in2
-rw-r--r--core/applets/suspendapplet/config.in2
-rw-r--r--core/applets/vmemo/config.in2
-rw-r--r--core/applets/volumeapplet/config.in2
-rw-r--r--core/apps/calibrate/config.in2
-rw-r--r--core/apps/embeddedkonsole/config.in2
-rw-r--r--core/apps/helpbrowser/config.in2
-rw-r--r--core/apps/qcop/config.in2
-rw-r--r--core/apps/textedit/config.in2
-rw-r--r--core/launcher/config.in2
-rw-r--r--core/multimedia/opieplayer/config.in4
-rw-r--r--core/multimedia/opieplayer/libflash/config.in2
-rw-r--r--core/multimedia/opieplayer/libmad/config.in2
-rw-r--r--core/multimedia/opieplayer/libmpeg3/config.in2
-rw-r--r--core/multimedia/opieplayer/modplug/config.in2
-rw-r--r--core/multimedia/opieplayer/wavplugin/config.in2
-rw-r--r--core/opie-login/config.in2
-rw-r--r--core/pim/addressbook/config.in2
-rw-r--r--core/pim/datebook/config.in2
-rw-r--r--core/pim/today/config.in2
-rw-r--r--core/pim/today/plugins/datebook/config.in2
-rw-r--r--core/pim/today/plugins/mail/config.in2
-rw-r--r--core/pim/today/plugins/todolist/config.in2
-rw-r--r--core/pim/todo/config.in2
-rw-r--r--core/settings/citytime/config.in2
-rw-r--r--core/settings/launcher/config.in2
-rw-r--r--core/settings/light-and-power/config.in2
-rw-r--r--core/settings/security/config.in2
-rw-r--r--development/keyview/config.in2
-rw-r--r--example/config.in2
-rw-r--r--freetype/config.in2
-rw-r--r--inputmethods/dvorak/config.in2
-rw-r--r--inputmethods/handwriting/config.in2
-rw-r--r--inputmethods/jumpx/config.in2
-rw-r--r--inputmethods/keyboard/config.in2
-rw-r--r--inputmethods/kjumpx/config.in2
-rw-r--r--inputmethods/multikey/config.in2
-rw-r--r--inputmethods/pickboard/config.in2
-rw-r--r--inputmethods/unikeyboard/config.in2
-rw-r--r--library/config.in8
-rw-r--r--libsql/test/config.in2
-rw-r--r--noncore/applets/notesapplet/config.in2
-rw-r--r--noncore/applets/wirelessapplet/config.in2
-rw-r--r--noncore/apps/advancedfm/config.in2
-rw-r--r--noncore/apps/checkbook/config.in2
-rw-r--r--noncore/apps/confedit/config.in2
-rw-r--r--noncore/apps/dictionary/config.in2
-rw-r--r--noncore/apps/opie-console/config.in2
-rw-r--r--noncore/apps/opie-reader/config.in2
-rw-r--r--noncore/apps/opie-sheet/config.in2
-rw-r--r--noncore/apps/opie-write/config.in2
-rw-r--r--noncore/apps/oxygen/config.in2
-rw-r--r--noncore/apps/tableviewer/config.in2
-rw-r--r--noncore/comm/keypebble/config.in2
-rw-r--r--noncore/comm/mobilemsg/config.in2
-rw-r--r--noncore/decorations/flat/config.in2
-rw-r--r--noncore/decorations/liquid/config.in2
-rw-r--r--noncore/decorations/polished/config.in2
-rw-r--r--noncore/games/bounce/config.in2
-rw-r--r--noncore/games/buzzword/config.in2
-rw-r--r--noncore/games/chess/config.in2
-rw-r--r--noncore/games/fifteen/config.in2
-rw-r--r--noncore/games/go/config.in2
-rw-r--r--noncore/games/kbill/config.in2
-rw-r--r--noncore/games/kcheckers/config.in2
-rw-r--r--noncore/games/kpacman/config.in2
-rw-r--r--noncore/games/mindbreaker/config.in2
-rw-r--r--noncore/games/minesweep/config.in2
-rw-r--r--noncore/games/parashoot/config.in2
-rw-r--r--noncore/games/qasteroids/config.in2
-rw-r--r--noncore/games/snake/config.in2
-rw-r--r--noncore/games/solitaire/config.in2
-rw-r--r--noncore/games/tetrix/config.in2
-rw-r--r--noncore/games/tictac/config.in2
-rw-r--r--noncore/games/wordgame/config.in2
-rw-r--r--noncore/graphics/drawpad/config.in2
-rw-r--r--noncore/multimedia/opieplayer2/config.in2
-rw-r--r--noncore/multimedia/showimg/config.in2
-rw-r--r--noncore/net/networksetup/config.in2
-rw-r--r--noncore/net/networksetup/interfaces/config.in2
-rw-r--r--noncore/net/networksetup/wlan/config.in2
-rw-r--r--noncore/net/opieftp/config.in2
-rw-r--r--noncore/net/opieirc/config.in2
-rw-r--r--noncore/net/opietooth/applet/config.in2
-rw-r--r--noncore/net/opietooth/blue-pin/config.in2
-rw-r--r--noncore/net/opietooth/lib/config.in2
-rw-r--r--noncore/net/opietooth/manager/config.in2
-rw-r--r--noncore/net/ubrowser/config.in2
-rw-r--r--noncore/net/wellenreiter/config.in2
-rw-r--r--noncore/settings/appearance2/config.in2
-rw-r--r--noncore/settings/aqpkg/config.in2
-rw-r--r--noncore/settings/backup/config.in2
-rw-r--r--noncore/settings/language/config.in2
-rw-r--r--noncore/settings/mediummount/config.in2
-rw-r--r--noncore/settings/netsystemtime/config.in2
-rw-r--r--noncore/settings/networksettings/config.in2
-rw-r--r--noncore/settings/networksettings/interfaces/config.in2
-rw-r--r--noncore/settings/networksettings/wlan/config.in2
-rw-r--r--noncore/settings/sound/config.in2
-rw-r--r--noncore/settings/sshkeys/config.in2
-rw-r--r--noncore/settings/sysinfo/config.in2
-rw-r--r--noncore/settings/tabmanager/config.in2
-rw-r--r--noncore/settings/usermanager/config.in2
-rw-r--r--noncore/styles/flat/config.in2
-rw-r--r--noncore/styles/fresh/config.in2
-rw-r--r--noncore/styles/liquid/config.in2
-rw-r--r--noncore/styles/metal/config.in2
-rw-r--r--noncore/styles/theme/config.in2
-rw-r--r--noncore/todayplugins/stockticker/config.in2
-rw-r--r--noncore/tools/calc2/binary/config.in2
-rw-r--r--noncore/tools/calc2/simple/config.in2
-rw-r--r--noncore/tools/calculator/config.in2
-rw-r--r--noncore/tools/clock/config.in2
-rw-r--r--noncore/tools/formatter/config.in2
-rw-r--r--noncore/tools/opie-sh/config.in2
-rw-r--r--noncore/tools/remote/config.in2
-rw-r--r--noncore/unsupported/filebrowser/config.in2
-rw-r--r--noncore/unsupported/gsmtool/config.in2
-rw-r--r--noncore/unsupported/mail2/bend/config.in2
-rw-r--r--noncore/unsupported/mail2/config.in2
-rw-r--r--noncore/unsupported/mail2/libmail/config.in2
-rw-r--r--noncore/unsupported/oipkg/config.in2
-rw-r--r--noncore/unsupported/qpdf/config.in2
-rw-r--r--packages4
-rw-r--r--quickexec/config.in2
-rw-r--r--x11/libqpe-x11/config.in9
137 files changed, 173 insertions, 144 deletions
diff --git a/Makefile.test b/Makefile.test
index 00cc906..55700f1 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -67,25 +67,29 @@ allyesconfig :
67 $(call descend,scripts/kconfig,conf) 67 $(call descend,scripts/kconfig,conf)
68 ./scripts/kconfig/conf -y ./config.in 68 ./scripts/kconfig/conf -y ./config.in
69 69
70allnoconfig : 70allnoconfig :
71 $(call descend,scripts/kconfig,conf) 71 $(call descend,scripts/kconfig,conf)
72 ./scripts/kconfig/conf -n ./config.in 72 ./scripts/kconfig/conf -n ./config.in
73 73
74defconfig : 74defconfig :
75 $(call descend,scripts/kconfig,conf) 75 $(call descend,scripts/kconfig,conf)
76 ./scripts/kconfig/conf -d ./config.in 76 ./scripts/kconfig/conf -d ./config.in
77 77
78 78
79export
80
79-include $(TOPDIR)/.config 81-include $(TOPDIR)/.config
80-include $(TOPDIR)/..config.cmd 82-include $(TOPDIR)/..config.cmd
81-include $(TOPDIR)/.depends 83-include $(TOPDIR)/.depends
82 84
83export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) 85export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
84 86
85all clean: $(subdir-y) 87all clean: $(subdir-y)
86 88
87$(subdir-y) : $(TOPDIR)/stamp-headers $(TOPDIR)/library/custom.h 89$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
90 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
91 $(TOPDIR)/library/custom.h
88 92
89clean : $(TOPDIR)/.config 93clean : $(TOPDIR)/.config
90 94
91include $(TOPDIR)/Rules.make 95include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index 567d926..d07372b 100644
--- a/Rules.make
+++ b/Rules.make
@@ -16,52 +16,74 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
16 >> $(TOPDIR)/.depends 16 >> $(TOPDIR)/.depends
17# interpackage dependency generation 17# interpackage dependency generation
18 cat $(TOPDIR)/packages | \ 18 cat $(TOPDIR)/packages | \
19 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 19 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
20 20
21$(TOPDIR)/.depends.cfgs: 21$(TOPDIR)/.depends.cfgs:
22# config.in interdependencies 22# config.in interdependencies
23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
24 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 24 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
25 @-rm -f dirs 25 @-rm -f dirs
26 26
27$(TOPDIR)/stamp-headers : 27$(TOPDIR)/stamp-headers :
28 @-rm -f $(TOPDIR)/stamp-headers*
28 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 29 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
29 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 30 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
30 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 31 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
31 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 32 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
32 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 33 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
33 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 34 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
34 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 35 ( cd include/opie && ln -sf ../../libsql/*.h .; )
35 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 36 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
36 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 37 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
37 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 38 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
38 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 39 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
40 ( cd $(QTDIR)/include; \
41 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
42 qcopchannel_qws.h qwindowsystem_qws.h \
43 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
44 touch $@
45
46$(TOPDIR)/stamp-headers-x11 :
47 @-rm -f $(TOPDIR)/stamp-headers*
48 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
49 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
50 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
51 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
52 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
53 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
54 ( cd include/opie && ln -sf ../../libsql/*.h .; )
55 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
56 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
57 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
58 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
59 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
60 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
39 touch $@ 61 touch $@
40 62
41$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 63$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
42 @-rm -f $@ 64 @-rm -f $@
43 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 65 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
44 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 66 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
45 @touch $@ 67 @touch $@
46 68
47$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake : 69$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake :
48 $(call descend,$(shell dirname $@),$(shell basename $@)) 70 $(call descend,$(shell dirname $@),$(shell basename $@))
49 71
50$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 72$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
51 73
52$(TOPDIR)/mkspecs/default : 74$(TOPDIR)/mkspecs/default :
53 ln -sf linux-g++ $@ 75 ln -sf linux-g++ $@
54 76
55## general rules ## 77## general rules ##
56 78
57define descend 79define descend
58 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 80 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
59endef 81endef
60 82
61define makefilegen 83define makefilegen
62 cd $(shell dirname $(1)); $(TOPDIR)/qmake/qmake $(3) -o $(shell basename $(1)) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro 84 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro
63endef 85endef
64 86
65define makecfg 87define makecfg
66 $(TOPDIR)/scripts/makecfg.pl $1 88 $(TOPDIR)/scripts/makecfg.pl $1
67endef 89endef
diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in
index 5cf8b12..16fe8f4 100644
--- a/core/applets/batteryapplet/config.in
+++ b/core/applets/batteryapplet/config.in
@@ -1,7 +1,7 @@
1menu "batteryapplet" 1menu "batteryapplet"
2 2
3 config BATTERYAPPLET 3 config BATTERYAPPLET
4 boolean "batteryapplet" 4 boolean "batteryapplet"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7endmenu 7endmenu
diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in
index 0f74814..328b2e1 100644
--- a/core/applets/cardmon/config.in
+++ b/core/applets/cardmon/config.in
@@ -1,4 +1,4 @@
1 config CARDMON 1 config CARDMON
2 boolean "cardmon" 2 boolean "cardmon"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/clipboardapplet/config.in b/core/applets/clipboardapplet/config.in
index 4ac0039..0b69fe0 100644
--- a/core/applets/clipboardapplet/config.in
+++ b/core/applets/clipboardapplet/config.in
@@ -1,4 +1,4 @@
1 config CLIPBOARDAPPLET 1 config CLIPBOARDAPPLET
2 boolean "clipboardapplet" 2 boolean "clipboardapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in
index 9c5f080..3ca12fe 100644
--- a/core/applets/clockapplet/config.in
+++ b/core/applets/clockapplet/config.in
@@ -1,4 +1,4 @@
1 config CLOCKAPPLET 1 config CLOCKAPPLET
2 boolean "clockapplet" 2 boolean "clockapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/homeapplet/config.in b/core/applets/homeapplet/config.in
index 3e37837..feb8097 100644
--- a/core/applets/homeapplet/config.in
+++ b/core/applets/homeapplet/config.in
@@ -1,4 +1,4 @@
1 config HOMEAPPLET 1 config HOMEAPPLET
2 boolean "homeapplet" 2 boolean "homeapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in
index c8e3667..0b2fc51 100644
--- a/core/applets/irdaapplet/config.in
+++ b/core/applets/irdaapplet/config.in
@@ -1,4 +1,4 @@
1 config IRDAAPPLET 1 config IRDAAPPLET
2 boolean "irdaapplet" 2 boolean "irdaapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/logoutapplet/config.in b/core/applets/logoutapplet/config.in
index a822e0e..3dc0408 100644
--- a/core/applets/logoutapplet/config.in
+++ b/core/applets/logoutapplet/config.in
@@ -1,4 +1,4 @@
1 config LOGOUTAPPLET 1 config LOGOUTAPPLET
2 boolean "logoutapplet" 2 boolean "logoutapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/obex/config.in b/core/applets/obex/config.in
index 4b6440d..33771db 100644
--- a/core/applets/obex/config.in
+++ b/core/applets/obex/config.in
@@ -1,4 +1,4 @@
1 config OBEX 1 config OBEX
2 boolean "obex" 2 boolean "obex"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/restartapplet/config.in b/core/applets/restartapplet/config.in
index 5c132c8..827b7ca 100644
--- a/core/applets/restartapplet/config.in
+++ b/core/applets/restartapplet/config.in
@@ -1,7 +1,7 @@
1menu "restartapplet" 1menu "restartapplet"
2 2
3 config #RESTARTAPPLET 3 config #RESTARTAPPLET
4 boolean "restartapplet" 4 boolean "restartapplet"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7endmenu 7endmenu
diff --git a/core/applets/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in
index 645ea3a..94e2b84 100644
--- a/core/applets/screenshotapplet/config.in
+++ b/core/applets/screenshotapplet/config.in
@@ -1,4 +1,4 @@
1 config SCREENSHOTAPPLET 1 config SCREENSHOTAPPLET
2 boolean "screenshotapplet" 2 boolean "screenshotapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/suspendapplet/config.in b/core/applets/suspendapplet/config.in
index 21ba192..4d3c42d 100644
--- a/core/applets/suspendapplet/config.in
+++ b/core/applets/suspendapplet/config.in
@@ -1,4 +1,4 @@
1 config SUSPENDAPPLET 1 config SUSPENDAPPLET
2 boolean "suspendapplet" 2 boolean "suspendapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/vmemo/config.in b/core/applets/vmemo/config.in
index f0857a2..bcf02f2 100644
--- a/core/applets/vmemo/config.in
+++ b/core/applets/vmemo/config.in
@@ -1,4 +1,4 @@
1 config VMEMO 1 config VMEMO
2 boolean "vmemo" 2 boolean "vmemo"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in
index 64037b2..f65faeb 100644
--- a/core/applets/volumeapplet/config.in
+++ b/core/applets/volumeapplet/config.in
@@ -1,4 +1,4 @@
1 config VOLUMEAPPLET 1 config VOLUMEAPPLET
2 boolean "volumeapplet" 2 boolean "volumeapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/apps/calibrate/config.in b/core/apps/calibrate/config.in
index 0a7d5da..e408448 100644
--- a/core/apps/calibrate/config.in
+++ b/core/apps/calibrate/config.in
@@ -1,4 +1,4 @@
1# config #CALIBRATE 1# config #CALIBRATE
2# boolean "calibrate" 2# boolean "calibrate"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/apps/embeddedkonsole/config.in b/core/apps/embeddedkonsole/config.in
index 6272667..a31d393 100644
--- a/core/apps/embeddedkonsole/config.in
+++ b/core/apps/embeddedkonsole/config.in
@@ -1,4 +1,4 @@
1 config EMBEDDEDKONSOLE 1 config EMBEDDEDKONSOLE
2 boolean "embeddedkonsole" 2 boolean "embeddedkonsole"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/apps/helpbrowser/config.in b/core/apps/helpbrowser/config.in
index 0614e44..aeeb483 100644
--- a/core/apps/helpbrowser/config.in
+++ b/core/apps/helpbrowser/config.in
@@ -1,4 +1,4 @@
1 config HELPBROWSER 1 config HELPBROWSER
2 boolean "helpbrowser" 2 boolean "helpbrowser"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/apps/qcop/config.in b/core/apps/qcop/config.in
index 9508714..f2cf066 100644
--- a/core/apps/qcop/config.in
+++ b/core/apps/qcop/config.in
@@ -1,4 +1,4 @@
1 config QCOP 1 config QCOP
2 boolean "qcop" 2 boolean "qcop"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/apps/textedit/config.in b/core/apps/textedit/config.in
index fae02ac..ee4bca9 100644
--- a/core/apps/textedit/config.in
+++ b/core/apps/textedit/config.in
@@ -1,4 +1,4 @@
1 config TEXTEDIT 1 config TEXTEDIT
2 boolean "textedit" 2 boolean "textedit"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/launcher/config.in b/core/launcher/config.in
index 87b678d..e6e664d 100644
--- a/core/launcher/config.in
+++ b/core/launcher/config.in
@@ -1,4 +1,4 @@
1 config LAUNCHER 1 config LAUNCHER
2 boolean "launcher" 2 boolean "launcher"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in
index 8d4ccf4..0757f94 100644
--- a/core/multimedia/opieplayer/config.in
+++ b/core/multimedia/opieplayer/config.in
@@ -1,13 +1,13 @@
1menu "opieplayer" 1menu "opieplayer"
2 2
3 config #LIBFFMPEG 3 config OPIEPLAYER
4 boolean "opieplayer" 4 boolean "opieplayer"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 source core/multimedia/opieplayer/libffmpeg/config.in 7 source core/multimedia/opieplayer/libffmpeg/config.in
8 source core/multimedia/opieplayer/libflash/config.in 8 source core/multimedia/opieplayer/libflash/config.in
9 source core/multimedia/opieplayer/libmad/config.in 9 source core/multimedia/opieplayer/libmad/config.in
10 source core/multimedia/opieplayer/libmpeg3/config.in 10 source core/multimedia/opieplayer/libmpeg3/config.in
11 source core/multimedia/opieplayer/modplug/config.in 11 source core/multimedia/opieplayer/modplug/config.in
12 source core/multimedia/opieplayer/wavplugin/config.in 12 source core/multimedia/opieplayer/wavplugin/config.in
13endmenu 13endmenu
diff --git a/core/multimedia/opieplayer/libflash/config.in b/core/multimedia/opieplayer/libflash/config.in
index 58a02a4..91a57da 100644
--- a/core/multimedia/opieplayer/libflash/config.in
+++ b/core/multimedia/opieplayer/libflash/config.in
@@ -1,4 +1,4 @@
1# config #LIBFLASH 1# config #LIBFLASH
2# boolean "libflash" 2# boolean "libflash"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/multimedia/opieplayer/libmad/config.in b/core/multimedia/opieplayer/libmad/config.in
index 3534637..03354b6 100644
--- a/core/multimedia/opieplayer/libmad/config.in
+++ b/core/multimedia/opieplayer/libmad/config.in
@@ -1,4 +1,4 @@
1 config LIBMAD 1 config LIBMAD
2 boolean "libmad" 2 boolean "libmad"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/multimedia/opieplayer/libmpeg3/config.in b/core/multimedia/opieplayer/libmpeg3/config.in
index e0f15c0..a72865f 100644
--- a/core/multimedia/opieplayer/libmpeg3/config.in
+++ b/core/multimedia/opieplayer/libmpeg3/config.in
@@ -1,4 +1,4 @@
1 config LIBMPEG3 1 config LIBMPEG3
2 boolean "libmpeg3" 2 boolean "libmpeg3"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/multimedia/opieplayer/modplug/config.in b/core/multimedia/opieplayer/modplug/config.in
index 065208f..67fbe8c 100644
--- a/core/multimedia/opieplayer/modplug/config.in
+++ b/core/multimedia/opieplayer/modplug/config.in
@@ -1,4 +1,4 @@
1 config MODPLUG 1 config MODPLUG
2 boolean "modplug" 2 boolean "modplug"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/multimedia/opieplayer/wavplugin/config.in b/core/multimedia/opieplayer/wavplugin/config.in
index a044366..c5201c7 100644
--- a/core/multimedia/opieplayer/wavplugin/config.in
+++ b/core/multimedia/opieplayer/wavplugin/config.in
@@ -1,4 +1,4 @@
1 config WAVPLUGIN 1 config WAVPLUGIN
2 boolean "wavplugin" 2 boolean "wavplugin"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/opie-login/config.in b/core/opie-login/config.in
index 4980dad..fe5cc7e 100644
--- a/core/opie-login/config.in
+++ b/core/opie-login/config.in
@@ -1,4 +1,4 @@
1 config OPIE-LOGIN 1 config OPIE-LOGIN
2 boolean "opie-login" 2 boolean "opie-login"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in
index 5362077..522541c 100644
--- a/core/pim/addressbook/config.in
+++ b/core/pim/addressbook/config.in
@@ -1,4 +1,4 @@
1 config ADDRESSBOOK 1 config ADDRESSBOOK
2 boolean "addressbook" 2 boolean "addressbook"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/datebook/config.in b/core/pim/datebook/config.in
index 7cc92bd..42d4f52 100644
--- a/core/pim/datebook/config.in
+++ b/core/pim/datebook/config.in
@@ -1,4 +1,4 @@
1 config DATEBOOK 1 config DATEBOOK
2 boolean "datebook" 2 boolean "datebook"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/today/config.in b/core/pim/today/config.in
index 695b708..6bcdbe2 100644
--- a/core/pim/today/config.in
+++ b/core/pim/today/config.in
@@ -1,8 +1,8 @@
1menu "today" 1menu "today"
2 2
3 config TODAY 3 config TODAY
4 boolean "today" 4 boolean "today"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 source core/pim/today/plugins/config.in 7 source core/pim/today/plugins/config.in
8endmenu 8endmenu
diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in
index 7d1e006..7a14438 100644
--- a/core/pim/today/plugins/datebook/config.in
+++ b/core/pim/today/plugins/datebook/config.in
@@ -1,4 +1,4 @@
1 config TODAY_DATEBOOK 1 config TODAY_DATEBOOK
2 boolean "datebook" 2 boolean "datebook"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/today/plugins/mail/config.in b/core/pim/today/plugins/mail/config.in
index f40696a..6f4450f 100644
--- a/core/pim/today/plugins/mail/config.in
+++ b/core/pim/today/plugins/mail/config.in
@@ -1,4 +1,4 @@
1 config TODAY_MAIL 1 config TODAY_MAIL
2 boolean "mail" 2 boolean "mail"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/today/plugins/todolist/config.in b/core/pim/today/plugins/todolist/config.in
index aef4ea4..48ba226 100644
--- a/core/pim/today/plugins/todolist/config.in
+++ b/core/pim/today/plugins/todolist/config.in
@@ -1,4 +1,4 @@
1 config TODAY_TODOLIST 1 config TODAY_TODOLIST
2 boolean "todolist" 2 boolean "todolist"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/todo/config.in b/core/pim/todo/config.in
index 8b456de..4f7da10 100644
--- a/core/pim/todo/config.in
+++ b/core/pim/todo/config.in
@@ -1,4 +1,4 @@
1 config TODO 1 config TODO
2 boolean "todo" 2 boolean "todo"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/settings/citytime/config.in b/core/settings/citytime/config.in
index 429c30f..f40252a 100644
--- a/core/settings/citytime/config.in
+++ b/core/settings/citytime/config.in
@@ -1,4 +1,4 @@
1 config CITYTIME 1 config CITYTIME
2 boolean "citytime" 2 boolean "citytime"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/settings/launcher/config.in b/core/settings/launcher/config.in
index 8a71b69..19fedd8 100644
--- a/core/settings/launcher/config.in
+++ b/core/settings/launcher/config.in
@@ -1,4 +1,4 @@
1 config LAUNCHER-SETTINGS 1 config LAUNCHER-SETTINGS
2 boolean "launcher" 2 boolean "launcher"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/settings/light-and-power/config.in b/core/settings/light-and-power/config.in
index 77302eb..8ebc714 100644
--- a/core/settings/light-and-power/config.in
+++ b/core/settings/light-and-power/config.in
@@ -1,4 +1,4 @@
1 config LIGHT-AND-POWER 1 config LIGHT-AND-POWER
2 boolean "light-and-power" 2 boolean "light-and-power"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/settings/security/config.in b/core/settings/security/config.in
index 648371d..73b6b8d 100644
--- a/core/settings/security/config.in
+++ b/core/settings/security/config.in
@@ -1,4 +1,4 @@
1 config SECURITY 1 config SECURITY
2 boolean "security" 2 boolean "security"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/development/keyview/config.in b/development/keyview/config.in
index a151d58..ce934d3 100644
--- a/development/keyview/config.in
+++ b/development/keyview/config.in
@@ -1,4 +1,4 @@
1# config #KEYVIEW 1# config #KEYVIEW
2# boolean "keyview" 2# boolean "keyview"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/example/config.in b/example/config.in
index 7487ef1..b3e07d3 100644
--- a/example/config.in
+++ b/example/config.in
@@ -1,4 +1,4 @@
1# config #EXAMPLE 1# config #EXAMPLE
2# boolean "example" 2# boolean "example"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/freetype/config.in b/freetype/config.in
index 061a18f..df59c49 100644
--- a/freetype/config.in
+++ b/freetype/config.in
@@ -1,4 +1,4 @@
1 config FREETYPE 1 config FREETYPE
2 boolean "freetype" 2 boolean "freetype"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/dvorak/config.in b/inputmethods/dvorak/config.in
index 317e1e3..f74717c 100644
--- a/inputmethods/dvorak/config.in
+++ b/inputmethods/dvorak/config.in
@@ -1,4 +1,4 @@
1 config DVORAK 1 config DVORAK
2 boolean "dvorak" 2 boolean "dvorak"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/handwriting/config.in b/inputmethods/handwriting/config.in
index 3738f24..8fd5315 100644
--- a/inputmethods/handwriting/config.in
+++ b/inputmethods/handwriting/config.in
@@ -1,4 +1,4 @@
1 config HANDWRITING 1 config HANDWRITING
2 boolean "handwriting" 2 boolean "handwriting"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/jumpx/config.in b/inputmethods/jumpx/config.in
index 32c2125..01635fd 100644
--- a/inputmethods/jumpx/config.in
+++ b/inputmethods/jumpx/config.in
@@ -1,4 +1,4 @@
1 config JUMPX 1 config JUMPX
2 boolean "jumpx" 2 boolean "jumpx"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/keyboard/config.in b/inputmethods/keyboard/config.in
index 03f4c1a..e260685 100644
--- a/inputmethods/keyboard/config.in
+++ b/inputmethods/keyboard/config.in
@@ -1,4 +1,4 @@
1 config KEYBOARD 1 config KEYBOARD
2 boolean "keyboard" 2 boolean "keyboard"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/kjumpx/config.in b/inputmethods/kjumpx/config.in
index 132f06a..8e0b5c2 100644
--- a/inputmethods/kjumpx/config.in
+++ b/inputmethods/kjumpx/config.in
@@ -1,4 +1,4 @@
1 config KJUMPX 1 config KJUMPX
2 boolean "kjumpx" 2 boolean "kjumpx"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/multikey/config.in b/inputmethods/multikey/config.in
index 7e6e268..da3eb9b 100644
--- a/inputmethods/multikey/config.in
+++ b/inputmethods/multikey/config.in
@@ -1,4 +1,4 @@
1 config MULTIKEY 1 config MULTIKEY
2 boolean "multikey" 2 boolean "multikey"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/pickboard/config.in b/inputmethods/pickboard/config.in
index 490effd..3b71e85 100644
--- a/inputmethods/pickboard/config.in
+++ b/inputmethods/pickboard/config.in
@@ -1,4 +1,4 @@
1 config PICKBOARD 1 config PICKBOARD
2 boolean "pickboard" 2 boolean "pickboard"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/inputmethods/unikeyboard/config.in b/inputmethods/unikeyboard/config.in
index 1ecd5dc..80bae0d 100644
--- a/inputmethods/unikeyboard/config.in
+++ b/inputmethods/unikeyboard/config.in
@@ -1,4 +1,4 @@
1 config UNIKEYBOARD 1 config UNIKEYBOARD
2 boolean "unikeyboard" 2 boolean "unikeyboard"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/library/config.in b/library/config.in
index 3fb4529..e87d1d2 100644
--- a/library/config.in
+++ b/library/config.in
@@ -1,3 +1,5 @@
1 config LIBQPE 1config LIBQPE
2 boolean "Qpe library" 2 boolean "Qpe library"
3 default "y" 3 default "y" if ! X11
4 default "n" if X11
5 depends on ! X11
diff --git a/libsql/test/config.in b/libsql/test/config.in
index 258bfe6..238d27f 100644
--- a/libsql/test/config.in
+++ b/libsql/test/config.in
@@ -1,4 +1,4 @@
1# config #TEST 1# config #TEST
2# boolean "test" 2# boolean "test"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in
index a2f7d4d..6a90f19 100644
--- a/noncore/applets/notesapplet/config.in
+++ b/noncore/applets/notesapplet/config.in
@@ -1,4 +1,4 @@
1 config NOTESAPPLET 1 config NOTESAPPLET
2 boolean "notesapplet" 2 boolean "notesapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/applets/wirelessapplet/config.in b/noncore/applets/wirelessapplet/config.in
index 55f1aa1..e502f93 100644
--- a/noncore/applets/wirelessapplet/config.in
+++ b/noncore/applets/wirelessapplet/config.in
@@ -1,4 +1,4 @@
1 config WIRELESSAPPLET 1 config WIRELESSAPPLET
2 boolean "wirelessapplet" 2 boolean "wirelessapplet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/advancedfm/config.in b/noncore/apps/advancedfm/config.in
index 968d373..c1e25c2 100644
--- a/noncore/apps/advancedfm/config.in
+++ b/noncore/apps/advancedfm/config.in
@@ -1,4 +1,4 @@
1 config ADVANCEDFM 1 config ADVANCEDFM
2 boolean "advancedfm" 2 boolean "advancedfm"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/checkbook/config.in b/noncore/apps/checkbook/config.in
index 89ab053..3a7993b 100644
--- a/noncore/apps/checkbook/config.in
+++ b/noncore/apps/checkbook/config.in
@@ -1,4 +1,4 @@
1 config CHECKBOOK 1 config CHECKBOOK
2 boolean "checkbook" 2 boolean "checkbook"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in
index 13e6d27..09bb9df 100644
--- a/noncore/apps/confedit/config.in
+++ b/noncore/apps/confedit/config.in
@@ -1,4 +1,4 @@
1 config CONFEDIT 1 config CONFEDIT
2 boolean "confedit" 2 boolean "confedit"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/dictionary/config.in b/noncore/apps/dictionary/config.in
index 2527127..e3afbfc 100644
--- a/noncore/apps/dictionary/config.in
+++ b/noncore/apps/dictionary/config.in
@@ -1,4 +1,4 @@
1# config #DICTIONARY 1# config #DICTIONARY
2# boolean "dictionary" 2# boolean "dictionary"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/opie-console/config.in b/noncore/apps/opie-console/config.in
index f7793fa..01c9a1c 100644
--- a/noncore/apps/opie-console/config.in
+++ b/noncore/apps/opie-console/config.in
@@ -1,8 +1,8 @@
1menu "opie-console" 1menu "opie-console"
2 2
3 config #TEST 3 config #TEST
4 boolean "opie-console" 4 boolean "opie-console"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 source noncore/apps/opie-console/test/config.in 7 source noncore/apps/opie-console/test/config.in
8endmenu 8endmenu
diff --git a/noncore/apps/opie-reader/config.in b/noncore/apps/opie-reader/config.in
index 801c4d9..9d63eb2 100644
--- a/noncore/apps/opie-reader/config.in
+++ b/noncore/apps/opie-reader/config.in
@@ -1,4 +1,4 @@
1 config OPIE-READER 1 config OPIE-READER
2 boolean "opie-reader" 2 boolean "opie-reader"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/opie-sheet/config.in b/noncore/apps/opie-sheet/config.in
index 7b66faf..d9450bb 100644
--- a/noncore/apps/opie-sheet/config.in
+++ b/noncore/apps/opie-sheet/config.in
@@ -1,4 +1,4 @@
1 config OPIE-SHEET 1 config OPIE-SHEET
2 boolean "opie-sheet" 2 boolean "opie-sheet"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/opie-write/config.in b/noncore/apps/opie-write/config.in
index 79650e9..9842b4b 100644
--- a/noncore/apps/opie-write/config.in
+++ b/noncore/apps/opie-write/config.in
@@ -1,4 +1,4 @@
1# config #OPIE-WRITE 1# config #OPIE-WRITE
2# boolean "opie-write" 2# boolean "opie-write"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/oxygen/config.in b/noncore/apps/oxygen/config.in
index b83022a..1fd0987 100644
--- a/noncore/apps/oxygen/config.in
+++ b/noncore/apps/oxygen/config.in
@@ -1,4 +1,4 @@
1 config OXYGEN 1 config OXYGEN
2 boolean "oxygen" 2 boolean "oxygen"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/tableviewer/config.in b/noncore/apps/tableviewer/config.in
index 8490d5d..31fadc0 100644
--- a/noncore/apps/tableviewer/config.in
+++ b/noncore/apps/tableviewer/config.in
@@ -1,4 +1,4 @@
1 config TABLEVIEWER 1 config TABLEVIEWER
2 boolean "tableviewer" 2 boolean "tableviewer"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/comm/keypebble/config.in b/noncore/comm/keypebble/config.in
index 7a81539..107d510 100644
--- a/noncore/comm/keypebble/config.in
+++ b/noncore/comm/keypebble/config.in
@@ -1,4 +1,4 @@
1 config KEYPEBBLE 1 config KEYPEBBLE
2 boolean "keypebble" 2 boolean "keypebble"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/comm/mobilemsg/config.in b/noncore/comm/mobilemsg/config.in
index a7f92ff..45c4ca4 100644
--- a/noncore/comm/mobilemsg/config.in
+++ b/noncore/comm/mobilemsg/config.in
@@ -1,4 +1,4 @@
1# config #MOBILEMSG 1# config #MOBILEMSG
2# boolean "mobilemsg" 2# boolean "mobilemsg"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/decorations/flat/config.in b/noncore/decorations/flat/config.in
index 80dc87d..74fc990 100644
--- a/noncore/decorations/flat/config.in
+++ b/noncore/decorations/flat/config.in
@@ -1,4 +1,4 @@
1 config DECO_FLAT 1 config DECO_FLAT
2 boolean "flat" 2 boolean "flat"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/decorations/liquid/config.in b/noncore/decorations/liquid/config.in
index 946d97d..2f41734 100644
--- a/noncore/decorations/liquid/config.in
+++ b/noncore/decorations/liquid/config.in
@@ -1,4 +1,4 @@
1 config DECO_LIQUID 1 config DECO_LIQUID
2 boolean "liquid" 2 boolean "liquid"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/decorations/polished/config.in b/noncore/decorations/polished/config.in
index 9feb134..df6c514 100644
--- a/noncore/decorations/polished/config.in
+++ b/noncore/decorations/polished/config.in
@@ -1,4 +1,4 @@
1 config DECO_POLISHED 1 config DECO_POLISHED
2 boolean "polished" 2 boolean "polished"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/bounce/config.in b/noncore/games/bounce/config.in
index c7f2c02..92ea429 100644
--- a/noncore/games/bounce/config.in
+++ b/noncore/games/bounce/config.in
@@ -1,4 +1,4 @@
1 config BOUNCE 1 config BOUNCE
2 boolean "bounce" 2 boolean "bounce"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/buzzword/config.in b/noncore/games/buzzword/config.in
index ad2525e..757daee 100644
--- a/noncore/games/buzzword/config.in
+++ b/noncore/games/buzzword/config.in
@@ -1,4 +1,4 @@
1 config BUZZWORD 1 config BUZZWORD
2 boolean "buzzword" 2 boolean "buzzword"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/chess/config.in b/noncore/games/chess/config.in
index e64e73c..6cddb51 100644
--- a/noncore/games/chess/config.in
+++ b/noncore/games/chess/config.in
@@ -1,4 +1,4 @@
1# config #CHESS 1# config #CHESS
2# boolean "chess" 2# boolean "chess"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/fifteen/config.in b/noncore/games/fifteen/config.in
index da35a05..880e178 100644
--- a/noncore/games/fifteen/config.in
+++ b/noncore/games/fifteen/config.in
@@ -1,4 +1,4 @@
1 config FIFTEEN 1 config FIFTEEN
2 boolean "fifteen" 2 boolean "fifteen"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/go/config.in b/noncore/games/go/config.in
index da542c3..25395f7 100644
--- a/noncore/games/go/config.in
+++ b/noncore/games/go/config.in
@@ -1,4 +1,4 @@
1 config GO 1 config GO
2 boolean "go" 2 boolean "go"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/kbill/config.in b/noncore/games/kbill/config.in
index 91a14d1..eb1900e 100644
--- a/noncore/games/kbill/config.in
+++ b/noncore/games/kbill/config.in
@@ -1,4 +1,4 @@
1 config KBILL 1 config KBILL
2 boolean "kbill" 2 boolean "kbill"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/kcheckers/config.in b/noncore/games/kcheckers/config.in
index 1a3c60b..a0226f0 100644
--- a/noncore/games/kcheckers/config.in
+++ b/noncore/games/kcheckers/config.in
@@ -1,4 +1,4 @@
1 config KCHECKERS 1 config KCHECKERS
2 boolean "kcheckers" 2 boolean "kcheckers"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/kpacman/config.in b/noncore/games/kpacman/config.in
index c8a4bc6..4e1befa 100644
--- a/noncore/games/kpacman/config.in
+++ b/noncore/games/kpacman/config.in
@@ -1,4 +1,4 @@
1 config KPACMAN 1 config KPACMAN
2 boolean "kpacman" 2 boolean "kpacman"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/mindbreaker/config.in b/noncore/games/mindbreaker/config.in
index f141ebc..8eff9da 100644
--- a/noncore/games/mindbreaker/config.in
+++ b/noncore/games/mindbreaker/config.in
@@ -1,4 +1,4 @@
1 config MINDBREAKER 1 config MINDBREAKER
2 boolean "mindbreaker" 2 boolean "mindbreaker"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/minesweep/config.in b/noncore/games/minesweep/config.in
index 90934b9..74c9e0d 100644
--- a/noncore/games/minesweep/config.in
+++ b/noncore/games/minesweep/config.in
@@ -1,4 +1,4 @@
1 config MINESWEEP 1 config MINESWEEP
2 boolean "minesweep" 2 boolean "minesweep"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/parashoot/config.in b/noncore/games/parashoot/config.in
index db6239c..956bdbb 100644
--- a/noncore/games/parashoot/config.in
+++ b/noncore/games/parashoot/config.in
@@ -1,4 +1,4 @@
1 config PARASHOOT 1 config PARASHOOT
2 boolean "parashoot" 2 boolean "parashoot"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/qasteroids/config.in b/noncore/games/qasteroids/config.in
index a619624..74eaa07 100644
--- a/noncore/games/qasteroids/config.in
+++ b/noncore/games/qasteroids/config.in
@@ -1,4 +1,4 @@
1 config QASTEROIDS 1 config QASTEROIDS
2 boolean "qasteroids" 2 boolean "qasteroids"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/snake/config.in b/noncore/games/snake/config.in
index 0048f9c..eade45e 100644
--- a/noncore/games/snake/config.in
+++ b/noncore/games/snake/config.in
@@ -1,4 +1,4 @@
1 config SNAKE 1 config SNAKE
2 boolean "snake" 2 boolean "snake"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/solitaire/config.in b/noncore/games/solitaire/config.in
index 8264469..20dce9e 100644
--- a/noncore/games/solitaire/config.in
+++ b/noncore/games/solitaire/config.in
@@ -1,4 +1,4 @@
1 config SOLITAIRE 1 config SOLITAIRE
2 boolean "solitaire" 2 boolean "solitaire"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/tetrix/config.in b/noncore/games/tetrix/config.in
index 596d2b5..e7d3993 100644
--- a/noncore/games/tetrix/config.in
+++ b/noncore/games/tetrix/config.in
@@ -1,4 +1,4 @@
1 config TETRIX 1 config TETRIX
2 boolean "tetrix" 2 boolean "tetrix"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/tictac/config.in b/noncore/games/tictac/config.in
index 9b65b8d..eff34ca 100644
--- a/noncore/games/tictac/config.in
+++ b/noncore/games/tictac/config.in
@@ -1,4 +1,4 @@
1 config TICTAC 1 config TICTAC
2 boolean "tictac" 2 boolean "tictac"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/wordgame/config.in b/noncore/games/wordgame/config.in
index 3969dc8..32b6eac 100644
--- a/noncore/games/wordgame/config.in
+++ b/noncore/games/wordgame/config.in
@@ -1,4 +1,4 @@
1 config WORDGAME 1 config WORDGAME
2 boolean "wordgame" 2 boolean "wordgame"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/graphics/drawpad/config.in b/noncore/graphics/drawpad/config.in
index 732330b..50fa916 100644
--- a/noncore/graphics/drawpad/config.in
+++ b/noncore/graphics/drawpad/config.in
@@ -1,4 +1,4 @@
1 config DRAWPAD 1 config DRAWPAD
2 boolean "drawpad" 2 boolean "drawpad"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/multimedia/opieplayer2/config.in b/noncore/multimedia/opieplayer2/config.in
index 2a03125..da0a647 100644
--- a/noncore/multimedia/opieplayer2/config.in
+++ b/noncore/multimedia/opieplayer2/config.in
@@ -1,4 +1,4 @@
1# config #OPIEPLAYER2 1# config #OPIEPLAYER2
2# boolean "opieplayer2" 2# boolean "opieplayer2"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/multimedia/showimg/config.in b/noncore/multimedia/showimg/config.in
index 0316ea6..0540c72 100644
--- a/noncore/multimedia/showimg/config.in
+++ b/noncore/multimedia/showimg/config.in
@@ -1,4 +1,4 @@
1 config SHOWIMG 1 config SHOWIMG
2 boolean "showimg" 2 boolean "showimg"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/networksetup/config.in b/noncore/net/networksetup/config.in
index b18bdbd..e151d6f 100644
--- a/noncore/net/networksetup/config.in
+++ b/noncore/net/networksetup/config.in
@@ -1,10 +1,10 @@
1menu "networksetup" 1menu "networksetup"
2 2
3 config INTERFACES 3 config INTERFACES
4 boolean "networksetup" 4 boolean "networksetup"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE && WLAN && INTERFACES 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES
7 7
8 source noncore/net/networksetup/wlan/config.in 8 source noncore/net/networksetup/wlan/config.in
9 source noncore/net/networksetup/interfaces/config.in 9 source noncore/net/networksetup/interfaces/config.in
10endmenu 10endmenu
diff --git a/noncore/net/networksetup/interfaces/config.in b/noncore/net/networksetup/interfaces/config.in
index 431e51b..b9873f7 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"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/networksetup/wlan/config.in b/noncore/net/networksetup/wlan/config.in
index 4853a32..7f552fc 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 "wlan"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opieftp/config.in b/noncore/net/opieftp/config.in
index fdb0e90..9d1e561 100644
--- a/noncore/net/opieftp/config.in
+++ b/noncore/net/opieftp/config.in
@@ -1,4 +1,4 @@
1 config OPIEFTP 1 config OPIEFTP
2 boolean "opieftp" 2 boolean "opieftp"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in
index 7aaa5d3..30184a9 100644
--- a/noncore/net/opieirc/config.in
+++ b/noncore/net/opieirc/config.in
@@ -1,4 +1,4 @@
1 config OPIEIRC 1 config OPIEIRC
2 boolean "opieirc" 2 boolean "opieirc"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/applet/config.in b/noncore/net/opietooth/applet/config.in
index 80afbe5..4d689b5 100644
--- a/noncore/net/opietooth/applet/config.in
+++ b/noncore/net/opietooth/applet/config.in
@@ -1,4 +1,4 @@
1# config #APPLET 1# config #APPLET
2# boolean "applet" 2# boolean "applet"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/blue-pin/config.in b/noncore/net/opietooth/blue-pin/config.in
index c3e3056..395537c 100644
--- a/noncore/net/opietooth/blue-pin/config.in
+++ b/noncore/net/opietooth/blue-pin/config.in
@@ -1,4 +1,4 @@
1# config #BLUE-PIN 1# config #BLUE-PIN
2# boolean "blue-pin" 2# boolean "blue-pin"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/lib/config.in b/noncore/net/opietooth/lib/config.in
index a8964f6..21c2fa3 100644
--- a/noncore/net/opietooth/lib/config.in
+++ b/noncore/net/opietooth/lib/config.in
@@ -1,4 +1,4 @@
1# config #LIB 1# config #LIB
2# boolean "lib" 2# boolean "lib"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in
index 704448f..a8c9f62 100644
--- a/noncore/net/opietooth/manager/config.in
+++ b/noncore/net/opietooth/manager/config.in
@@ -1,4 +1,4 @@
1# config #MANAGER 1# config #MANAGER
2# boolean "manager" 2# boolean "manager"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/ubrowser/config.in b/noncore/net/ubrowser/config.in
index 4b15046..562741d 100644
--- a/noncore/net/ubrowser/config.in
+++ b/noncore/net/ubrowser/config.in
@@ -1,4 +1,4 @@
1# config #UBROWSER 1# config #UBROWSER
2# boolean "ubrowser" 2# boolean "ubrowser"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/wellenreiter/config.in b/noncore/net/wellenreiter/config.in
index ff4a0cb..d6b48d8 100644
--- a/noncore/net/wellenreiter/config.in
+++ b/noncore/net/wellenreiter/config.in
@@ -1,4 +1,4 @@
1# config #WELLENREITER 1# config #WELLENREITER
2# boolean "wellenreiter" 2# boolean "wellenreiter"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/appearance2/config.in b/noncore/settings/appearance2/config.in
index e853545..0da6502 100644
--- a/noncore/settings/appearance2/config.in
+++ b/noncore/settings/appearance2/config.in
@@ -1,4 +1,4 @@
1 config APPEARANCE2 1 config APPEARANCE2
2 boolean "appearance2" 2 boolean "appearance2"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/aqpkg/config.in b/noncore/settings/aqpkg/config.in
index b16c0b8..4b5ffa7 100644
--- a/noncore/settings/aqpkg/config.in
+++ b/noncore/settings/aqpkg/config.in
@@ -1,4 +1,4 @@
1 config AQPKG 1 config AQPKG
2 boolean "aqpkg" 2 boolean "aqpkg"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/backup/config.in b/noncore/settings/backup/config.in
index 5fc09ef..b59f33f 100644
--- a/noncore/settings/backup/config.in
+++ b/noncore/settings/backup/config.in
@@ -1,4 +1,4 @@
1 config BACKUP 1 config BACKUP
2 boolean "backup" 2 boolean "backup"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/language/config.in b/noncore/settings/language/config.in
index 1315904..ce5e335 100644
--- a/noncore/settings/language/config.in
+++ b/noncore/settings/language/config.in
@@ -1,4 +1,4 @@
1 config LANGUAGE 1 config LANGUAGE
2 boolean "language" 2 boolean "language"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/mediummount/config.in b/noncore/settings/mediummount/config.in
index 2bf9442..76e9500 100644
--- a/noncore/settings/mediummount/config.in
+++ b/noncore/settings/mediummount/config.in
@@ -1,4 +1,4 @@
1 config MEDIUMMOUNT 1 config MEDIUMMOUNT
2 boolean "mediummount" 2 boolean "mediummount"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/netsystemtime/config.in b/noncore/settings/netsystemtime/config.in
index 0420d8e..697c1ea 100644
--- a/noncore/settings/netsystemtime/config.in
+++ b/noncore/settings/netsystemtime/config.in
@@ -1,4 +1,4 @@
1 config NETSYSTEMTIME 1 config NETSYSTEMTIME
2 boolean "netsystemtime" 2 boolean "netsystemtime"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in
index b18bdbd..e151d6f 100644
--- a/noncore/settings/networksettings/config.in
+++ b/noncore/settings/networksettings/config.in
@@ -1,10 +1,10 @@
1menu "networksetup" 1menu "networksetup"
2 2
3 config INTERFACES 3 config INTERFACES
4 boolean "networksetup" 4 boolean "networksetup"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE && WLAN && INTERFACES 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES
7 7
8 source noncore/net/networksetup/wlan/config.in 8 source noncore/net/networksetup/wlan/config.in
9 source noncore/net/networksetup/interfaces/config.in 9 source noncore/net/networksetup/interfaces/config.in
10endmenu 10endmenu
diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in
index 431e51b..b9873f7 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"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index 4853a32..7f552fc 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 "wlan"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/sound/config.in b/noncore/settings/sound/config.in
index 5e0b52f..e99b200 100644
--- a/noncore/settings/sound/config.in
+++ b/noncore/settings/sound/config.in
@@ -1,4 +1,4 @@
1 config SOUND 1 config SOUND
2 boolean "sound" 2 boolean "sound"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/sshkeys/config.in b/noncore/settings/sshkeys/config.in
index 634aa3a..1e7f626 100644
--- a/noncore/settings/sshkeys/config.in
+++ b/noncore/settings/sshkeys/config.in
@@ -1,4 +1,4 @@
1 config SSHKEYS 1 config SSHKEYS
2 boolean "sshkeys" 2 boolean "sshkeys"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/sysinfo/config.in b/noncore/settings/sysinfo/config.in
index 062f035..f321b94 100644
--- a/noncore/settings/sysinfo/config.in
+++ b/noncore/settings/sysinfo/config.in
@@ -1,4 +1,4 @@
1 config SYSINFO 1 config SYSINFO
2 boolean "sysinfo" 2 boolean "sysinfo"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/tabmanager/config.in b/noncore/settings/tabmanager/config.in
index f0c4c08..3737058 100644
--- a/noncore/settings/tabmanager/config.in
+++ b/noncore/settings/tabmanager/config.in
@@ -1,4 +1,4 @@
1 config TABMANAGER 1 config TABMANAGER
2 boolean "tabmanager" 2 boolean "tabmanager"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/usermanager/config.in b/noncore/settings/usermanager/config.in
index 2dd0b9e..5484a4e 100644
--- a/noncore/settings/usermanager/config.in
+++ b/noncore/settings/usermanager/config.in
@@ -1,4 +1,4 @@
1 config USERMANAGER 1 config USERMANAGER
2 boolean "usermanager" 2 boolean "usermanager"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/flat/config.in b/noncore/styles/flat/config.in
index 1c82de1..ae6edb6 100644
--- a/noncore/styles/flat/config.in
+++ b/noncore/styles/flat/config.in
@@ -1,4 +1,4 @@
1 config FLAT 1 config FLAT
2 boolean "flat" 2 boolean "flat"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/fresh/config.in b/noncore/styles/fresh/config.in
index f71de8d..7199c18 100644
--- a/noncore/styles/fresh/config.in
+++ b/noncore/styles/fresh/config.in
@@ -1,4 +1,4 @@
1 config FRESH 1 config FRESH
2 boolean "fresh" 2 boolean "fresh"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/liquid/config.in b/noncore/styles/liquid/config.in
index d2bbddb..b510625 100644
--- a/noncore/styles/liquid/config.in
+++ b/noncore/styles/liquid/config.in
@@ -1,4 +1,4 @@
1 config LIQUID 1 config LIQUID
2 boolean "liquid" 2 boolean "liquid"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/metal/config.in b/noncore/styles/metal/config.in
index 1d86924..991fc74 100644
--- a/noncore/styles/metal/config.in
+++ b/noncore/styles/metal/config.in
@@ -1,4 +1,4 @@
1 config METAL 1 config METAL
2 boolean "metal" 2 boolean "metal"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/theme/config.in b/noncore/styles/theme/config.in
index c90a422..27c8125 100644
--- a/noncore/styles/theme/config.in
+++ b/noncore/styles/theme/config.in
@@ -1,4 +1,4 @@
1 config THEME 1 config THEME
2 boolean "theme" 2 boolean "theme"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in
index e9ee1b7..036b04c 100644
--- a/noncore/todayplugins/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/config.in
@@ -1,10 +1,10 @@
1menu "stockticker" 1menu "stockticker"
2 2
3 config TODAY_STOCKTICKER 3 config TODAY_STOCKTICKER
4 boolean "stockticker" 4 boolean "stockticker"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 7
8 source noncore/todayplugins/stockticker/stockticker/config.in 8 source noncore/todayplugins/stockticker/stockticker/config.in
9 source noncore/todayplugins/stockticker/stocktickerlib/config.in 9 source noncore/todayplugins/stockticker/stocktickerlib/config.in
10endmenu 10endmenu
diff --git a/noncore/tools/calc2/binary/config.in b/noncore/tools/calc2/binary/config.in
index 7db862d..3a90707 100644
--- a/noncore/tools/calc2/binary/config.in
+++ b/noncore/tools/calc2/binary/config.in
@@ -1,4 +1,4 @@
1# config #BINARY 1# config #BINARY
2# boolean "binary" 2# boolean "binary"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/calc2/simple/config.in b/noncore/tools/calc2/simple/config.in
index 726b78d..a22a020 100644
--- a/noncore/tools/calc2/simple/config.in
+++ b/noncore/tools/calc2/simple/config.in
@@ -1,4 +1,4 @@
1# config #SIMPLE 1# config #SIMPLE
2# boolean "simple" 2# boolean "simple"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/calculator/config.in b/noncore/tools/calculator/config.in
index 9a8d8be..a290e5e 100644
--- a/noncore/tools/calculator/config.in
+++ b/noncore/tools/calculator/config.in
@@ -1,4 +1,4 @@
1 config CALCULATOR 1 config CALCULATOR
2 boolean "calculator" 2 boolean "calculator"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/clock/config.in b/noncore/tools/clock/config.in
index c9c099c..341b42a 100644
--- a/noncore/tools/clock/config.in
+++ b/noncore/tools/clock/config.in
@@ -1,4 +1,4 @@
1 config CLOCK 1 config CLOCK
2 boolean "clock" 2 boolean "clock"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/formatter/config.in b/noncore/tools/formatter/config.in
index 70146bd..89c05e2 100644
--- a/noncore/tools/formatter/config.in
+++ b/noncore/tools/formatter/config.in
@@ -1,4 +1,4 @@
1 config FORMATTER 1 config FORMATTER
2 boolean "formatter" 2 boolean "formatter"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in
index 77c1857..782ae5f 100644
--- a/noncore/tools/opie-sh/config.in
+++ b/noncore/tools/opie-sh/config.in
@@ -1,4 +1,4 @@
1 config OPIE-SH 1 config OPIE-SH
2 boolean "opie-sh" 2 boolean "opie-sh"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/remote/config.in b/noncore/tools/remote/config.in
index ef51047..231696b 100644
--- a/noncore/tools/remote/config.in
+++ b/noncore/tools/remote/config.in
@@ -1,4 +1,4 @@
1 config REMOTE 1 config REMOTE
2 boolean "remote" 2 boolean "remote"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/filebrowser/config.in b/noncore/unsupported/filebrowser/config.in
index 46debbd..02c6521 100644
--- a/noncore/unsupported/filebrowser/config.in
+++ b/noncore/unsupported/filebrowser/config.in
@@ -1,4 +1,4 @@
1 config FILEBROWSER 1 config FILEBROWSER
2 boolean "filebrowser" 2 boolean "filebrowser"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/gsmtool/config.in b/noncore/unsupported/gsmtool/config.in
index 76c7eb7..f023d61 100644
--- a/noncore/unsupported/gsmtool/config.in
+++ b/noncore/unsupported/gsmtool/config.in
@@ -1,4 +1,4 @@
1# config #GSMTOOL 1# config #GSMTOOL
2# boolean "gsmtool" 2# boolean "gsmtool"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/mail2/bend/config.in b/noncore/unsupported/mail2/bend/config.in
index 3d33fe4..1cea22f 100644
--- a/noncore/unsupported/mail2/bend/config.in
+++ b/noncore/unsupported/mail2/bend/config.in
@@ -1,4 +1,4 @@
1 config BEND 1 config BEND
2 boolean "bend" 2 boolean "bend"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in
index 2263230..4c50723 100644
--- a/noncore/unsupported/mail2/config.in
+++ b/noncore/unsupported/mail2/config.in
@@ -1,9 +1,9 @@
1menu "mail" 1menu "mail"
2 2
3 config BEND 3 config BEND
4 boolean "mail" 4 boolean "mail"
5 default "y" 5 default "y"
6 depends LIBQPE && LIBOPIE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
7 source noncore/mail/bend/config.in 7 source noncore/mail/bend/config.in
8 source noncore/mail/libmail/config.in 8 source noncore/mail/libmail/config.in
9endmenu 9endmenu
diff --git a/noncore/unsupported/mail2/libmail/config.in b/noncore/unsupported/mail2/libmail/config.in
index 6712dbe..e9ce917 100644
--- a/noncore/unsupported/mail2/libmail/config.in
+++ b/noncore/unsupported/mail2/libmail/config.in
@@ -1,4 +1,4 @@
1 config LIBMAIL 1 config LIBMAIL
2 boolean "libmail" 2 boolean "libmail"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/oipkg/config.in b/noncore/unsupported/oipkg/config.in
index 63a96e3..987994e 100644
--- a/noncore/unsupported/oipkg/config.in
+++ b/noncore/unsupported/oipkg/config.in
@@ -1,4 +1,4 @@
1 config OIPKG 1 config OIPKG
2 boolean "oipkg" 2 boolean "oipkg"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/qpdf/config.in b/noncore/unsupported/qpdf/config.in
index 2f0dc9d..dfd4f0a 100644
--- a/noncore/unsupported/qpdf/config.in
+++ b/noncore/unsupported/qpdf/config.in
@@ -1,4 +1,4 @@
1 config QPDF 1 config QPDF
2 boolean "qpdf" 2 boolean "qpdf"
3 default "y" 3 default "y"
4 depends LIBQPE && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/packages b/packages
index fbc1828..448036e 100644
--- a/packages
+++ b/packages
@@ -7,39 +7,39 @@
7 #CONFIG_CONVERTER noncore/unsupported/opiemail/converterconverter.pro 7 #CONFIG_CONVERTER noncore/unsupported/opiemail/converterconverter.pro
8 #CONFIG_DIALUP noncore/unsupported/netsetup/dialupdialup.pro 8 #CONFIG_DIALUP noncore/unsupported/netsetup/dialupdialup.pro
9 #CONFIG_DICTIONARY noncore/apps/dictionarydictionary.pro 9 #CONFIG_DICTIONARY noncore/apps/dictionarydictionary.pro
10 #CONFIG_EXAMPLE exampleexample.pro 10 #CONFIG_EXAMPLE exampleexample.pro
11 #CONFIG_GSMTOOL noncore/comm/gsmtoolgsmtool.pro 11 #CONFIG_GSMTOOL noncore/comm/gsmtoolgsmtool.pro
12 #CONFIG_KEYVIEW development/keyviewkeyview.pro 12 #CONFIG_KEYVIEW development/keyviewkeyview.pro
13 #CONFIG_LAN noncore/unsupported/netsetup/lanlan.pro 13 #CONFIG_LAN noncore/unsupported/netsetup/lanlan.pro
14 #CONFIG_LIB noncore/net/opietooth/liblib.pro 14 #CONFIG_LIB noncore/net/opietooth/liblib.pro
15 #CONFIG_LIB noncore/unsupported/opiemail/liblib.pro 15 #CONFIG_LIB noncore/unsupported/opiemail/liblib.pro
16 #CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro 16 #CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro
17 #CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro 17 #CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro
18 #CONFIG_LIBOPIE_PIM libopie/pimpim.pro 18 #CONFIG_LIBOPIE_PIM libopie/pimpim.pro
19 #CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro 19 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro
20 #CONFIG_LIBSQL libsqllibsql.pro 20 #CONFIG_LIBSQL libsqllibsql.pro
21 #CONFIG_MANAGER noncore/net/opietooth/managermanager.pro 21 #CONFIG_MANAGER noncore/net/opietooth/managermanager.pro
22 #CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro 22 #CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro
23 #CONFIG_NETSETUP noncore/unsupported/netsetupnetsetup.pro 23 #CONFIG_NETSETUP noncore/unsupported/netsetupnetsetup.pro
24 #CONFIG_OFILESELECTOR libopie/ofileselectorofileselector.pro 24 #CONFIG_OFILESELECTOR libopie/ofileselectorofileselector.pro
25 #CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro 25 #CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro
26 #CONFIG_OPIEMAIL noncore/unsupported/opiemailopiemail.pro 26 #CONFIG_OPIEMAIL noncore/unsupported/opiemailopiemail.pro
27 #CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro 27 #CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro
28 #CONFIG_POP3 noncore/unsupported/opiemail/ifaces/pop3pop3.pro 28 #CONFIG_POP3 noncore/unsupported/opiemail/ifaces/pop3pop3.pro
29 #CONFIG_QUICKEXEC quickexecquickexec.pro 29 #CONFIG_QUICKEXEC quickexecquickexec.pro
30 #CONFIG_RESTARTAPPLET core/applets/restartappletrestartapplet.pro 30 #CONFIG_RESTARTAPPLET core/applets/restartappletrestartapplet.pro
31 #CONFIG_RESTARTAPPLET2 core/applets/restartapplet2restartapplet2.pro 31 #CONFIG_RESTARTAPPLET2 core/applets/restartapplet2restartapplet2.pro
32 #CONFIG_SDMON noncore/unsupported/sdmonsdmon.pro 32 #CONFIG_SDMON noncore/unsupported/sdmonsdmon.pro
33 #CONFIG_SERVER x11/ipc/serverserver.pro 33 CONFIG_OCOPSERVER x11/ipc/serverocopserver.pro
34 #CONFIG_SIMPLE noncore/tools/calc2/simplesimple.pro 34 #CONFIG_SIMPLE noncore/tools/calc2/simplesimple.pro
35 #CONFIG_SMTP noncore/unsupported/opiemail/ifaces/smtpsmtp.pro 35 #CONFIG_SMTP noncore/unsupported/opiemail/ifaces/smtpsmtp.pro
36 #CONFIG_SPREADSHEET noncore/unsupported/spreadsheetspreadsheet.pro 36 #CONFIG_SPREADSHEET noncore/unsupported/spreadsheetspreadsheet.pro
37 #CONFIG_SYSTEMTIME noncore/unsupported/systemtimesystemtime.pro 37 #CONFIG_SYSTEMTIME noncore/unsupported/systemtimesystemtime.pro
38 #CONFIG_TEST libsql/testtest.pro 38 #CONFIG_TEST libsql/testtest.pro
39 #CONFIG_TEST noncore/apps/opie-console/testtest.pro 39 #CONFIG_TEST noncore/apps/opie-console/testtest.pro
40 #CONFIG_UBROWSER noncore/net/ubrowserubrowser.pro 40 #CONFIG_UBROWSER noncore/net/ubrowserubrowser.pro
41 #CONFIG_WELLENREITER noncore/net/wellenreiterwellenreiter.pro 41 #CONFIG_WELLENREITER noncore/net/wellenreiterwellenreiter.pro
42 #CONFIG_WLANSETUP noncore/unsupported/wlansetupwlansetup.pro 42 #CONFIG_WLANSETUP noncore/unsupported/wlansetupwlansetup.pro
43 CONFIG_ADDRESSBOOK core/pim/addressbookaddressbook.pro 43 CONFIG_ADDRESSBOOK core/pim/addressbookaddressbook.pro
44 CONFIG_ADVANCEDFM noncore/apps/advancedfmadvancedfm.pro 44 CONFIG_ADVANCEDFM noncore/apps/advancedfmadvancedfm.pro
45 CONFIG_APPEARANCE2 noncore/settings/appearance2appearance2.pro 45 CONFIG_APPEARANCE2 noncore/settings/appearance2appearance2.pro
diff --git a/quickexec/config.in b/quickexec/config.in
index ece5e3b..57eac96 100644
--- a/quickexec/config.in
+++ b/quickexec/config.in
@@ -1,4 +1,4 @@
1# config #QUICKEXEC 1# config #QUICKEXEC
2# boolean "quickexec" 2# boolean "quickexec"
3# default "y" 3# default "y"
4# depends LIBQPE && LIBOPIE 4# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/x11/libqpe-x11/config.in b/x11/libqpe-x11/config.in
index 2e546a4..841d639 100644
--- a/x11/libqpe-x11/config.in
+++ b/x11/libqpe-x11/config.in
@@ -1,4 +1,5 @@
1# config #LIBQPE-X11 1config LIBQPE-X11
2# boolean "libqpe-x11" 2 boolean "Qpe library (x11 enabled)"
3# default "y" 3 default "y" if X11
4# depends LIBQPE && LIBOPIE 4 default "n" if ! X11
5 depends on X11