aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kolesa <daniel@octaforge.org>2018-08-01 13:31:15 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-01 13:31:15 -0400
commit9d9a3e87c8c29740dd0c143e2125ceb0eb6cdf5e (patch)
treef4cd7ad9f55dfe636f2285b60171965e0aa23592
parentci: print config.log if configure fails (diff)
downloadefl-9d9a3e87c8c29740dd0c143e2125ceb0eb6cdf5e.tar.gz
build: disable Lua binding generation
Summary: As Lua bindings don't work right now, it is pointless to waste build time generating them. Elua itself on the other hand is useful and should stay enabled. This also does some preparation work for separate configure switch for bindings after release, but for now keep configure switches as they are. Reviewers: zmike, stefan_schmidt Subscribers: cedric, bu5hm4n, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6721
-rw-r--r--configure.ac15
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/Makefile_Ecore_Audio.am2
-rw-r--r--src/Makefile_Ecore_Con.am2
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/Makefile_Elementary.am2
-rw-r--r--src/Makefile_Elua_Helper.am4
-rw-r--r--src/Makefile_Emotion.am2
-rw-r--r--src/Makefile_Evas.am2
10 files changed, 25 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index b73e753c87..1a2f89d016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5190,17 +5190,28 @@ AC_ARG_ENABLE([elua],
fi
],
[want_elua="yes"])
+
+# turn this into an AC_ARG_ENABLE when bindings are reenabled
+want_lua_bindings="no"
+
have_elua="yes"
+have_lua_bindings="yes"
+
if test "${want_lua_old}" = "yes" -o "x$want_elua" = "xno"; then
have_elua="no"
fi
+if test "x$have_elua" = "xno" -o "x$want_lua_bindings" = "xno"; then
+ have_lua_bindings="no"
+fi
+
+AM_CONDITIONAL([HAVE_ELUA], [test "x${have_elua}" = "xyes"])
+AM_CONDITIONAL([HAVE_LUA_BINDINGS], [test "x${have_lua_bindings}" = "xyes"])
+
EFL_LIB_START_OPTIONAL([Elua], [test "${have_elua}" = "yes"])
### Default values
-AM_CONDITIONAL([HAVE_ELUA], [test "x${have_elua}" = "xyes"])
-
### Additional options to configure
### Checks for programs
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 30e49987e7..47b74678a3 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)