stefan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0f427650ac0879cf385bd92643127499318bcc45
commit 0f427650ac0879cf385bd92643127499318bcc45
Author: Stefan Schmidt <s.schm...@samsung.com>
Date: Wed Apr 8 17:40:02 2015 +0200
build: Allow to define path for eldbus-codegen binary
Since the latest elm colorclass changes we need eldbus-codegen to generate
some files. Not all setups have this in their normal $PATH so let allow
these
setups to set the correct path during configure. This allows our Jenkins
setup
as well as others to work again.
---
configure.ac | 2 ++
src/lib/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 5695a1d..f3a3a37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ EFL_WITH_BIN([elementary], [elementary-codegen],
[elementary_codegen])
EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc])
EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx])
+EFL_WITH_BIN([eldbus], [eldbus_codegen], [eldbus-codegen])
# Force the helper to try external eolian generators
AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true])
AM_CONDITIONAL([HAVE_EOLIAN_CXX], [true])
@@ -560,6 +561,7 @@ echo " elementary_codegen.......: ${elementary_codegen}"
echo " elm_prefs_cc.............: ${elm_prefs_cc}"
echo " eolian_gen...............: ${eolian_gen}"
echo " eolian_cxx...............: ${eolian_cxx}"
+echo " eldbus_codegen...........: ${eldbus_codegen}"
echo
echo " Build elementary_test....: ${have_elementary_test}"
echo " Build elementary_codegen.: ${have_elementary_codegen}"
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fb7d942..8c137e8 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -524,7 +524,7 @@ elm_intro.h.in
$(COLORCLASS_GEN): elm_color_class.xml
@cd $(top_builddir)/src/lib && \
- eldbus-codegen $(abs_top_srcdir)/src/lib/elm_color_class.xml
+ @eldbus_codegen@ $(abs_top_srcdir)/src/lib/elm_color_class.xml
elm_color_class.c: $(COLORCLASS_GEN)
--
