* edje: fix edje external module path.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@51251 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index f1c12fb..8d0360b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,10 +60,12 @@ EFL_CHECK_PATH_MAX
 
 case "$host_os" in
    mingw32ce* | cegcc*)
+      MODULE_ARCH="$host_os-$host_cpu"
       install_vim="no"
       have_edje_cc="no"
       ;;
    *)
+      MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
       install_vim="yes"
       have_edje_cc="yes"
       ;;
@@ -71,6 +73,8 @@ esac
 
 requirement_edje=""
 
+AC_SUBST(MODULE_ARCH)
+AC_DEFINE_UNQUOTED(MODULE_ARCH, "${MODULE_ARCH}", "Module architecture")
 
 ### Additional options to configure
 

diff --git a/src/lib/edje_module.c b/src/lib/edje_module.c
index c6f20da..f06563a 100644 (file)
--- a/src/lib/edje_module.c
+++ b/src/lib/edje_module.c
@@ -81,13 +81,42 @@ edje_module_load(const char *module)
 void
 _edje_module_init(void)
 {
-   unsigned int i;
    Eina_Array_Iterator it;
    Eina_Module *m;
+   char *paths[4] = { NULL, NULL, NULL, NULL };
+   unsigned int i;
+   unsigned int j;
 
    _registered_modules = eina_hash_string_small_new(NULL);
-   _available_modules = eina_module_list_get(_available_modules,
-           PACKAGE_LIB_DIR "/edje", 0, NULL, NULL);
+
+   /* 1. ~/.edje/modules/ */
+   paths[0] = eina_module_environment_path_get("HOME", "/.edje/modules");
+   /* 2. $(EVAS_MODULE_DIR)/edje/modules/ */
+   paths[1] = eina_module_environment_path_get("EDJE_MODULES_DIR", "/edje/modules");
+   /* 3. libedje.so/../edje/modules/ */
+   paths[2] = eina_module_symbol_path_get(_edje_module_init, "/edje/modules");
+   /* 4. PREFIX/evas/modules/ */
+#ifndef _MSC_VER
+   paths[3] = PACKAGE_LIB_DIR "/evas/modules";
+#endif
+
+   for (j = 0; j < ((sizeof (paths) / sizeof (char*)) - 1); ++j)
+     for (i = j + 1; i < sizeof (paths) / sizeof (char*); ++i)
+       if (paths[i] && paths[j] && !strcmp(paths[i], paths[j]))
+        paths[i] = NULL;
+
+   for (i = 0; i < sizeof (paths) / sizeof (char*); ++i)
+     if (paths[i])
+       {
+         char *tmp;
+         unsigned int len;
+
+         len = strlen(paths[i]) + strlen(MODULE_ARCH) + 5;
+         tmp = alloca(len);
+         snprintf(tmp, len, "%s/%s/", paths[i], MODULE_ARCH);
+
+         _available_modules = eina_module_list_get(_available_modules, tmp, 0, NULL, NULL);
+       }
 
    if (!_available_modules)
      {