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
@@ -77,25 +77,25 @@ CONFIG_HANDWRITING	inputmethods/handwriting	handwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
         CONFIG_INTERFACES       noncore/net/networksetup/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.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
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_MAIL     noncore/mailmail.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
@@ -150,13 +150,14 @@ CONFIG_TODAY_MAIL	core/pim/today/plugins/mail	mail.pro
         CONFIG_TODAY_STOCKTICKER        noncore/todayplugins/stockticker/stocktickerstockticker.pro
         CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro
         CONFIG_TODO     core/pim/todotodo.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.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