fix amalgamation after lua2 changes.

BTW, if lua2 is the default, maybe we could remove the mess that is
the first version? SVN serves as history as well.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@50157 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/edje_lua.c b/src/lib/edje_lua.c
index bc18d07..e4df121 100644 (file)
--- a/src/lib/edje_lua.c
+++ b/src/lib/edje_lua.c
@@ -122,6 +122,8 @@ void *alloca(size_t);
 #include <lauxlib.h>
 #include <lualib.h>
 
+#ifndef LUA2
+
 #define EDJE_LUA_GET 1
 #define EDJE_LUA_SET 2
 #define EDJE_LUA_FN 3
@@ -5712,3 +5714,5 @@ _edje_lua_shutdown()
    lua_close(Ledje);
    Ledje = NULL;
 }
+
+#endif // not LUA2

diff --git a/src/lib/edje_main.c b/src/lib/edje_main.c
index fc3cc46..78fe73a 100644 (file)
--- a/src/lib/edje_main.c
+++ b/src/lib/edje_main.c
@@ -93,7 +93,9 @@ edje_init(void)
    _edje_box_init();
    _edje_external_init();
    _edje_module_init();
+#ifndef LUA2
    _edje_lua_init();
+#endif
    _edje_message_init();
 
    _edje_real_part_mp = eina_mempool_add("chained_mempool",
@@ -122,7 +124,9 @@ edje_init(void)
    _edje_real_part_state_mp = NULL;
    _edje_real_part_mp = NULL;
    _edje_message_shutdown();
+#ifndef LUA2
    _edje_lua_shutdown();
+#endif
    _edje_module_shutdown();
    _edje_external_shutdown();
    _edje_box_shutdown();
@@ -181,7 +185,9 @@ edje_shutdown(void)
    _edje_real_part_mp = NULL;
 
    _edje_message_shutdown();
+#ifndef LUA2
    _edje_lua_shutdown();
+#endif
    _edje_module_shutdown();
    _edje_external_shutdown();
    _edje_box_shutdown();