edje: only compile edje from 1.7 branch with Lua 5.1.

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

diff --git a/ChangeLog b/ChangeLog
index a262f5d..c2a7986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -623,3 +623,7 @@
 
         * Fix inheriting gorups with programs that have after programs where
         after programs are duplicated in the list.
+
+2012-12-13  Cedric Bail
+
+       * Enforce compilation with Lua 5.1 only.

diff --git a/NEWS b/NEWS
index 1cf7b5c..f655102 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Edje 1.7.4
+
+Changes since Edje 1.7.3:
+-------------------------
+
+Fixes:
+    * Enforce compilation with Lua 5.1 only.
+
 Edje 1.7.3
 
 Changes since Edje 1.7.2:

diff --git a/configure.ac b/configure.ac
index 7d254d7..a985fc0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -235,10 +235,10 @@ AC_SUBST(EFL_EDJE_BUILD)
 have_lua="yes"
 requirement_lua=""
 lua_libs=""
-PKG_CHECK_MODULES([LUA], [lua >= 5.1.0], requirement_lua="lua",
-   [PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1.0], requirement_lua="lua5.1",
-      [PKG_CHECK_MODULES([LUA], [lua-5.1 >= 5.1.0], requirement_lua="lua-5.1",
-         [PKG_CHECK_MODULES([LUA], [lua51 >= 5.1.0], requirement_lua="lua51",
+PKG_CHECK_MODULES([LUA], [lua >= 5.1.0 lua < 5.2.0], requirement_lua="lua",
+   [PKG_CHECK_MODULES([LUA], [lua5.1 >= 5.1.0 lua5.1 < 5.2.0], requirement_lua="lua5.1",
+      [PKG_CHECK_MODULES([LUA], [lua-5.1 >= 5.1.0 lua-5.1 < 5.2.0], requirement_lua="lua-5.1",
+         [PKG_CHECK_MODULES([LUA], [lua51 >= 5.1.0 lua51 < 5.2.0], requirement_lua="lua51",
             [have_lua="no"])])])])
 
 if test "x${have_lua}" = "xno" ; then