From 857fcebbf971acd50286d8e52d362d88e2baae50 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Tue, 20 Aug 2013 18:29:01 +1000 Subject: [PATCH] Check for both Lua 5.1 and 5.2. Patch inspired by a similar patch from Robert Heller. --- configure.ac | 2 +- m4/efl_lua.m4 | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index caae382707..5f1643778e 100644 --- a/configure.ac +++ b/configure.ac @@ -3470,7 +3470,7 @@ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio]) EFL_ADD_FEATURE([EDJE], [physics]) EFL_ADD_FEATURE([EDJE], [multisense]) -EFL_CHECK_LUA_5_1([EDJE]) +EFL_CHECK_LUA([EDJE]) EFL_ADD_LIBS([EDJE], [-lm]) EFL_EVAL_PKGS([EDJE]) diff --git a/m4/efl_lua.m4 b/m4/efl_lua.m4 index 61eccf1193..b66ad0c7e8 100644 --- a/m4/efl_lua.m4 +++ b/m4/efl_lua.m4 @@ -1,14 +1,17 @@ -dnl EFL_CHECK_LUA_5_1(EFL) -dnl checks for lua5.1 in pkg-config (multiple names) and -llua directly +dnl EFL_CHECK_LUA(EFL) +dnl checks for lua 5.1 or 5.2 in pkg-config (multiple names) and -llua directly dnl will call EFL_ADD_LIBS() or EFL_DEPEND_PKG() as required. dnl this is a strict call and will abort if lua is not found -AC_DEFUN([EFL_CHECK_LUA_5_1], +AC_DEFUN([EFL_CHECK_LUA], [dnl requirement_lua="" PKG_CHECK_EXISTS([lua >= 5.1.0], [requirement_lua="lua >= 5.1.0"], [PKG_CHECK_EXISTS([lua5.1 >= 5.1.0], [requirement_lua="lua5.1 >= 5.1.0"], [PKG_CHECK_EXISTS([lua-5.1 >= 5.1.0], [requirement_lua="lua-5.1 >= 5.1.0"], - [PKG_CHECK_EXISTS([lua51 >= 5.1.0], [requirement_lua="lua51 >= 5.1.0"])])])]) + [PKG_CHECK_EXISTS([lua51 >= 5.1.0], [requirement_lua="lua51 >= 5.1.0"], + [PKG_CHECK_EXISTS([lua5.2 >= 5.2.0], [requirement_lua="lua5.2 >= 5.2.0"], + [PKG_CHECK_EXISTS([lua-5.2 >= 5.2.0], [requirement_lua="lua-5.2 >= 5.2.0"], + [PKG_CHECK_EXISTS([lua52 >= 5.2.0], [requirement_lua="lua52 >= 5.2.0"])])])])])])]) if test "x${requirement_lua}" = "x"; then AC_MSG_CHECKING([whether lua_newstate() is in liblua]) @@ -18,7 +21,7 @@ if test "x${requirement_lua}" = "x"; then [have_lua="no"]) AC_MSG_RESULT([${have_lua}]) if test "${have_lua}" = "no"; then - AC_MSG_ERROR([Missing lua 5.1 support]) + AC_MSG_ERROR([Missing lua 5.1 or 5.2 support]) fi else EFL_DEPEND_PKG([$1], [LUA], [${requirement_lua}])