Index: configfile.cpp
===================================================================
--- configfile.cpp  (revision 155)
+++ configfile.cpp  (revision 156)
@@ -1,4 +1,4 @@
-/*
+/*
  *  Copyright (c) 2010,
  *  Gavriloaie Eugen-Andrei (shiretu@gmail.com)
  *
@@ -840,7 +840,7 @@
 }

 void ConfigFile::Normalize(Variant &appConfigurationNode) {
-   //FINEST("Before:\n%s", STR(configuration.ToString()));
+   //FINEST("Before:\n%s", STR(_configuration.ToString()));

    appConfigurationNode[CONF_APPLICATION_DIRECTORY] =
            format("%s%s%c", STR(_rootApplicationsDirectory),
@@ -848,22 +848,43 @@

    string name = appConfigurationNode[CONF_APPLICATION_NAME];

+   string appSearchStyle = "native";
+   if ((VariantType)_configuration["appSearchStyle"] == V_STRING) {
+       appSearchStyle = (string)_configuration["appSearchStyle"];
+   }

    //1. Normalize the library path
    if ((VariantType) appConfigurationNode[CONF_APPLICATION_LIBRARY] == V_NULL) {

        string libraryName = format(LIBRARY_NAME_PATTERN, STR(name));
-       appConfigurationNode[CONF_APPLICATION_LIBRARY] = format("%s%s",
+       if (appSearchStyle == "native") {
+           appConfigurationNode[CONF_APPLICATION_LIBRARY] = format("%s%s",
                STR(appConfigurationNode[CONF_APPLICATION_DIRECTORY]),
                STR(libraryName));
+       } else if (appSearchStyle == "linux") {
+           appConfigurationNode[CONF_APPLICATION_LIBRARY] = format("lib/%s%s",
+               STR(_rootApplicationsDirectory),
+               STR(libraryName));
+       } else {
+           WARN("Unknown application library search style value is set: \'%s\'\nFall back to native mode", STR(_configuration["appSearchStyle"]));
+           appConfigurationNode[CONF_APPLICATION_LIBRARY] = format("%s%s",
+               STR(appConfigurationNode[CONF_APPLICATION_DIRECTORY]),
+               STR(libraryName));
+       }
    }

    //2. Normalize the media folder
    if ((VariantType) appConfigurationNode[CONF_APPLICATION_MEDIAFOLDER] == V_NULL) {
-       appConfigurationNode[CONF_APPLICATION_MEDIAFOLDER] = format("%s%s%c",
+       if (appSearchStyle == "linux") {
+           appConfigurationNode[CONF_APPLICATION_MEDIAFOLDER] = format("%s%c",
+               CONF_APPLICATION_MEDIAFOLDER,
+               PATH_SEPARATOR);
+       } else {
+           appConfigurationNode[CONF_APPLICATION_MEDIAFOLDER] = format("%s%s%c",
                STR(appConfigurationNode[CONF_APPLICATION_DIRECTORY]),
                CONF_APPLICATION_MEDIAFOLDER,
                PATH_SEPARATOR);
+       }
    } else {
        string mediaFolder = appConfigurationNode[CONF_APPLICATION_MEDIAFOLDER];
        if (mediaFolder[mediaFolder.length() - 1] != PATH_SEPARATOR)