forked from enlightenment/efl
edje: use luajit by default, if you want lua use --enable-lua-old
This commit is contained in:
parent
34b8045d90
commit
6db1691595
25
configure.ac
25
configure.ac
|
@ -3584,6 +3584,19 @@ AC_ARG_ENABLE([multisense],
|
||||||
],
|
],
|
||||||
[want_multisense="no"])
|
[want_multisense="no"])
|
||||||
|
|
||||||
|
want_lua_old="no"
|
||||||
|
AC_ARG_ENABLE([lua-old],
|
||||||
|
[AC_HELP_STRING([--enable-lua-old],
|
||||||
|
[Enable interpreted Lua support (5.1 or 5.2). @<:@default=disabled@:>@])],
|
||||||
|
[
|
||||||
|
if test "x${enableval}" = "xyes" ; then
|
||||||
|
want_lua_old="yes"
|
||||||
|
else
|
||||||
|
want_lua_old="no"
|
||||||
|
fi
|
||||||
|
],
|
||||||
|
[want_lua_old="no"])
|
||||||
|
|
||||||
# TODO: should we keep or remove these?
|
# TODO: should we keep or remove these?
|
||||||
want_edje_program_cache="no"
|
want_edje_program_cache="no"
|
||||||
want_edje_calc_cache="yes"
|
want_edje_calc_cache="yes"
|
||||||
|
@ -3612,8 +3625,14 @@ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio])
|
||||||
|
|
||||||
EFL_ADD_FEATURE([EDJE], [physics])
|
EFL_ADD_FEATURE([EDJE], [physics])
|
||||||
EFL_ADD_FEATURE([EDJE], [multisense])
|
EFL_ADD_FEATURE([EDJE], [multisense])
|
||||||
|
EFL_ADD_FEATURE([EDJE], [lua-old])
|
||||||
|
|
||||||
|
if test "${want_lua_old}" = "yes"; then
|
||||||
|
EFL_CHECK_LUA_OLD([EDJE])
|
||||||
|
else
|
||||||
|
EFL_DEPEND_PKG([EDJE], [LUAJIT], [luajit >= 2.0.0])
|
||||||
|
fi
|
||||||
|
|
||||||
EFL_CHECK_LUA([EDJE])
|
|
||||||
EFL_ADD_LIBS([EDJE], [-lm])
|
EFL_ADD_LIBS([EDJE], [-lm])
|
||||||
|
|
||||||
EFL_EVAL_PKGS([EDJE])
|
EFL_EVAL_PKGS([EDJE])
|
||||||
|
@ -3629,6 +3648,10 @@ AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
|
||||||
AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
|
AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
|
||||||
[1], [Use Multisense])
|
[1], [Use Multisense])
|
||||||
AC_SUBST([want_multisense])
|
AC_SUBST([want_multisense])
|
||||||
|
AM_CONDITIONAL([ENABLE_LUA_OLD], [test "${want_lua_old}" = "yes"])
|
||||||
|
AC_DEFINE_IF([ENABLE_LUA_OLD], [test "${want_lua_old}" = "yes"],
|
||||||
|
[1], [Use interpreted Lua (5.1 or 5.2)])
|
||||||
|
AC_SUBST([want_lua_old])
|
||||||
AC_SUBST([want_physics])
|
AC_SUBST([want_physics])
|
||||||
|
|
||||||
### Checks for header files
|
### Checks for header files
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
dnl EFL_CHECK_LUA(EFL)
|
dnl EFL_CHECK_LUA_OLD(EFL)
|
||||||
dnl checks for lua 5.1 or 5.2 in pkg-config (multiple names) and -llua directly
|
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 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
|
dnl this is a strict call and will abort if lua is not found
|
||||||
AC_DEFUN([EFL_CHECK_LUA],
|
dnl keep in mind that this is only executed if --enable-lua-old is set
|
||||||
|
AC_DEFUN([EFL_CHECK_LUA_OLD],
|
||||||
[dnl
|
[dnl
|
||||||
requirement_lua=""
|
requirement_lua=""
|
||||||
PKG_CHECK_EXISTS([lua >= 5.1.0], [requirement_lua="lua >= 5.1.0"],
|
PKG_CHECK_EXISTS([lua >= 5.1.0], [requirement_lua="lua >= 5.1.0"],
|
Loading…
Reference in New Issue