Ensure libpreload gets built

2 files changed, 15 insertions, 2 deletions

diff --git a/core/launcher/config.in b/core/launcher/config.in
index e6e664d..1917fd0 100644
--- a/core/launcher/config.in
+++ b/core/launcher/config.in
@@ -1,4 +1,16 @@
   config LAUNCHER
     boolean "launcher"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+
+if LAUNCHER
+  config PRELOAD
+    boolean
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER
+
+  config LAUNCHER_CORE
+    boolean
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER && PRELOAD
+endif
diff --git a/packages b/packages
index 4f54a49..2984793 100644
--- a/packages
+++ b/packages
@@ -83,13 +83,13 @@ CONFIG_KBILL	noncore/games/kbill	kbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
-        CONFIG_LAUNCHER         core/launcherlauncher.pro
+        CONFIG_LAUNCHER_CORE    core/launcherlauncher.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
         CONFIG_LIBMAIL  noncore/mail/libmaillibmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBQPE   librarylibrary.pro
@@ -156,7 +156,8 @@ CONFIG_USERMANAGER	noncore/settings/usermanager	usermanager.pro
         CONFIG_VMEMO    core/applets/vmemovmemo.pro
         CONFIG_VOLUMEAPPLET     core/applets/volumeappletvolumeapplet.pro
         CONFIG_WAVPLUGIN        core/multimedia/opieplayer/wavpluginwavplugin.pro
         CONFIG_WIRELESSAPPLET   noncore/applets/wirelessappletwirelessapplet.pro
         CONFIG_WLAN     noncore/net/networksetup/wlanwlan.pro
         CONFIG_WORDGAME         noncore/games/wordgamewordgame.pro
-        CONFIG_OPIEALARMipaq/opiealarm
+        CONFIG_OPIEALARMcore/opiealarm
+        CONFIG_PRELOAD          core/launcher/libpreloadlibpreload.pro