summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDaniel Kolesa <quaker66@gmail.com>2014-01-17 19:07:59 +0000
committerDaniel Kolesa <quaker66@gmail.com>2014-01-17 19:07:59 +0000
commit6db16915951af61d28f62f4de7c14c76e4303f18 (patch)
tree3b6560632d39eab69b974fc794cb9a9d269c5336 /configure.ac
parent34b8045d902d808716152d36b5d7c91f3dd058ae (diff)
edje: use luajit by default, if you want lua use --enable-lua-old
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac43
1 files changed, 33 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 62ed2c5..045af73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -576,8 +576,8 @@ AC_ARG_ENABLE([systemd],
576 576
577if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then 577if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then
578 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192], 578 PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon >= 192 libsystemd-journal >= 192],
579 [have_systemd_pkg="yes"], 579 [have_systemd_pkg="yes"],
580 [have_systemd_pkg="no"]) 580 [have_systemd_pkg="no"])
581fi 581fi
582 582
583# check for systemd library if requested 583# check for systemd library if requested
@@ -3170,20 +3170,20 @@ EFL_OPTIONAL_DEPEND_PKG([EEZE], [${want_libmount}],
3170EFL_ADD_FEATURE([EEZE], [libmount], [${have_eeze_mount}]) 3170EFL_ADD_FEATURE([EEZE], [libmount], [${have_eeze_mount}])
3171 3171
3172PKG_CHECK_EXISTS([mount < 2.19.0], 3172PKG_CHECK_EXISTS([mount < 2.19.0],
3173 [have_libmount_old="yes"], 3173 [have_libmount_old="yes"],
3174 [have_libmount_old="no"]) 3174 [have_libmount_old="no"])
3175AC_MSG_CHECKING([Use old libmount API (before 2.19.0)]) 3175AC_MSG_CHECKING([Use old libmount API (before 2.19.0)])
3176AC_MSG_RESULT([${have_libmount_old}]) 3176AC_MSG_RESULT([${have_libmount_old}])
3177 3177
3178PKG_CHECK_EXISTS([mount == 2.19.0], 3178PKG_CHECK_EXISTS([mount == 2.19.0],
3179 [have_libmount_219="yes"], 3179 [have_libmount_219="yes"],
3180 [have_libmount_219="no"]) 3180 [have_libmount_219="no"])
3181AC_MSG_CHECKING([Use libmount 2.19.0 API]) 3181AC_MSG_CHECKING([Use libmount 2.19.0 API])
3182AC_MSG_RESULT([${have_libmount_219}]) 3182AC_MSG_RESULT([${have_libmount_219}])
3183 3183
3184PKG_CHECK_EXISTS([mount > 2.19.0], 3184PKG_CHECK_EXISTS([mount > 2.19.0],
3185 [have_libmount_new="yes"], 3185 [have_libmount_new="yes"],
3186 [have_libmount_new="no"]) 3186 [have_libmount_new="no"])
3187AC_MSG_CHECKING([Use new libmount API (older than 2.19.0)]) 3187AC_MSG_CHECKING([Use new libmount API (older than 2.19.0)])
3188AC_MSG_RESULT([${have_libmount_new}]) 3188AC_MSG_RESULT([${have_libmount_new}])
3189 3189
@@ -3230,7 +3230,7 @@ AC_DEFINE_UNQUOTED([EEZE_EJECT_BIN], ["$with_eeze_eject"], [eject bin to use])
3230EFL_LIB_END_OPTIONAL([Eeze]) 3230EFL_LIB_END_OPTIONAL([Eeze])
3231 3231
3232AM_CONDITIONAL([EEZE_LIBMOUNT_AFTER_219], 3232AM_CONDITIONAL([EEZE_LIBMOUNT_AFTER_219],
3233 [test "x${have_libmount_new}" = "xyes"]) 3233 [test "x${have_libmount_new}" = "xyes"])
3234AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219], 3234AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219],
3235 [test "x${have_libmount_old}" = "xyes"]) 3235 [test "x${have_libmount_old}" = "xyes"])
3236AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xyes"]) 3236AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xyes"])
@@ -3584,6 +3584,19 @@ AC_ARG_ENABLE([multisense],
3584 ], 3584 ],
3585 [want_multisense="no"]) 3585 [want_multisense="no"])
3586 3586
3587want_lua_old="no"
3588AC_ARG_ENABLE([lua-old],
3589 [AC_HELP_STRING([--enable-lua-old],
3590 [Enable interpreted Lua support (5.1 or 5.2). @<:@default=disabled@:>@])],
3591 [
3592 if test "x${enableval}" = "xyes" ; then
3593 want_lua_old="yes"
3594 else
3595 want_lua_old="no"
3596 fi
3597 ],
3598 [want_lua_old="no"])
3599
3587# TODO: should we keep or remove these? 3600# TODO: should we keep or remove these?
3588want_edje_program_cache="no" 3601want_edje_program_cache="no"
3589want_edje_calc_cache="yes" 3602want_edje_calc_cache="yes"
@@ -3612,8 +3625,14 @@ EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio])
3612 3625
3613EFL_ADD_FEATURE([EDJE], [physics]) 3626EFL_ADD_FEATURE([EDJE], [physics])
3614EFL_ADD_FEATURE([EDJE], [multisense]) 3627EFL_ADD_FEATURE([EDJE], [multisense])
3628EFL_ADD_FEATURE([EDJE], [lua-old])
3629
3630if test "${want_lua_old}" = "yes"; then
3631 EFL_CHECK_LUA_OLD([EDJE])
3632else
3633 EFL_DEPEND_PKG([EDJE], [LUAJIT], [luajit >= 2.0.0])
3634fi
3615 3635
3616EFL_CHECK_LUA([EDJE])
3617EFL_ADD_LIBS([EDJE], [-lm]) 3636EFL_ADD_LIBS([EDJE], [-lm])
3618 3637
3619EFL_EVAL_PKGS([EDJE]) 3638EFL_EVAL_PKGS([EDJE])
@@ -3629,6 +3648,10 @@ AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
3629AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"], 3648AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
3630 [1], [Use Multisense]) 3649 [1], [Use Multisense])
3631AC_SUBST([want_multisense]) 3650AC_SUBST([want_multisense])
3651AM_CONDITIONAL([ENABLE_LUA_OLD], [test "${want_lua_old}" = "yes"])
3652AC_DEFINE_IF([ENABLE_LUA_OLD], [test "${want_lua_old}" = "yes"],
3653 [1], [Use interpreted Lua (5.1 or 5.2)])
3654AC_SUBST([want_lua_old])
3632AC_SUBST([want_physics]) 3655AC_SUBST([want_physics])
3633 3656
3634### Checks for header files 3657### Checks for header files