build: always build elua, make bindings build optionaldevs/q66/elua_enable

This change makes the build system build elua always, except
when lua-old is requested, in which case luajit is not available
and elua will not be built.

Bindings now have a separate configure option. For now, bindings
are built by default, to mimic previous behavior, but disabling
bindings will no longer also disable elua.

10 files changed, 28 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index b73e753c87..f007bd3207 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5179,27 +5179,35 @@ EFL_EVAL_PKGS([ETHUMB_CLIENT])
 EFL_LIB_END([Ethumb_Client])
 #### End of Ethumb_Client
 
-#### Elua
-AC_ARG_ENABLE([elua],
-   [AS_HELP_STRING([--enable-elua],[enable ELUA support. @<:@default=enabled@:>@])],
+#### Elua and lua bindings
+AC_ARG_ENABLE([lua-bindings],
+   [AS_HELP_STRING([--enable-lua-bindings],[enable Lua bindings. @<:@default=enabled@:>@])],
    [
     if test "x${enableval}" = "xyes" ; then
-       want_elua="yes"
+       want_lua_bindings="yes"
     else
-       want_elua="no"
+       want_lua_bindings="no"
     fi
    ],
-   [want_elua="yes"])
+   [want_lua_bindings="yes"])
+
 have_elua="yes"
-if test "${want_lua_old}" = "yes" -o "x$want_elua" = "xno"; then
+have_lua_bindings="yes"
+
+if test "x$want_lua_old" = "xyes"; then
   have_elua="no"
 fi
 
+if test "x$have_elua" = "xno" -o "x$want_lua_bindings" = "xno"; then
+  have_lua_bindings="no"
+fi
+
 EFL_LIB_START_OPTIONAL([Elua], [test "${have_elua}" = "yes"])
 
 ### Default values
 
 AM_CONDITIONAL([HAVE_ELUA], [test "x${have_elua}" = "xyes"])
+AM_CONDITIONAL([HAVE_LUA_BINDINGS], [test "x${have_lua_bindings}" = "xyes"])
 
 ### Additional options to configure
 
@@ -5945,6 +5953,7 @@ echo "  C++11.........: ${have_cxx11}"
 echo "  C#............: ${want_csharp}"
 echo "  JavaScript....: ${want_js}"
 echo "  JavaScript flg: $EINA_JS_LIBS"
+echo "  Lua bindings..: ${have_lua_bindings}"
 echo "Eina............: yes (${features_eina} unwind=$have_unwind)"
 echo "Eo..............: yes (${features_eo})"
 echo "Eolian..........: yes (${features_eolian})"
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index a33c8f8d9b..7716c1d8db 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -390,7 +390,7 @@ EXTRA_DIST2 += \
 tests/ecore/sample.wav \
 tests/ecore/sample.ogg
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 ecore_eolian_lua = $(ecore_eolian_files:%.eo=%.eo.lua)
 
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 393fdfa799..919104fc93 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -75,7 +75,7 @@ lib/ecore_audio/ecore_audio_sndfile_vio.c
 endif
 
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 ecore_audio_eolian_lua = $(ecore_audio_eolian_files:%.eo=%.eo.lua)
 
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 2568922992..ca1e80f617 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -236,7 +236,7 @@ tests_ecore_con_ecore_con_suite_DEPENDENCIES = \
 
 endif
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 ecore_con_eolian_lua = $(ecore_con_eolian_files:%.eo=%.eo.lua)
 
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index fc83eaadc6..683583ae10 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -364,7 +364,7 @@ tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ $(EDJE_TEST_FILES)
 
 endif
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 edje_eolian_lua = $(edje_eolian_files:%.eo=%.eo.lua)
 
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 972eda7e04..2dff54077a 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -147,7 +147,7 @@ nodist_installed_eflinterfaces_DATA = \
 	$(efl_eolian_files_h) \
 	$(efl_eolian_legacy_files_h)
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 efl_eolian_lua = $(efl_eolian_files:%.eo=%.eo.lua)
 
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index b2a356b1f1..ac464f27a5 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1597,7 +1597,7 @@ tests_elementary_efl_ui_suite_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@
 tests_elementary_efl_ui_suite_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@ $(top_builddir)/data/elementary/objects/test.edj
 endif
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 elementary_eolian_lua = $(elm_public_eolian_files:%.eo=%.eo.lua)
 
diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am
index fa8782af4b..091b21e884 100644
--- a/src/Makefile_Elua_Helper.am
+++ b/src/Makefile_Elua_Helper.am
@@ -1,3 +1,5 @@
+if HAVE_LUA_BINDINGS
+
 if HAVE_ELUA_BIN
 ELUA_GEN = @elua_bin@ lualian
 _ELUA_GEN_DEP = @elua_bin@
@@ -22,3 +24,5 @@ SUFFIXES += .lua
 
 %.eo.lua: %.eo ${_ELUA_GEN_DEP}
 	$(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $<
+
+endif
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index c1dcd7beba..919edc0516 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -334,7 +334,7 @@ tests/emotion/data/whb.png \
 tests/emotion/data/window_inner_shadow.png \
 modules/emotion/generic/README
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 emotion_eolian_lua = $(emotion_eolian_files:%.eo=%.eo.lua)
 
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index deab83005d..f882c1edfb 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2529,7 +2529,7 @@ tests/evas/images/train.j2k.png \
 tests/evas/dicts/hyph_en_US.dic \
 tests/evas/dicts/hyph_de_DE.dic
 
-if HAVE_ELUA
+if HAVE_LUA_BINDINGS
 
 evas_eolian_lua = $(evas_canvas_eolian_pub_files:%.eo=%.eo.lua) \
                   $(evas_gesture_eolian_pub_files:%.eo=%.eo.lua)