stefan pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=20fef454f648df4318e6086f37e1e16dfbaa728f
commit 20fef454f648df4318e6086f37e1e16dfbaa728f
Author: Stefan Schmidt <s.schm...@samsung.com>
Date: Wed Apr 8 18:20:29 2015 +0200
build: Allow to define path for eldbus-codegen binary
Since the geolocation and music-control 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 | 3 +++
src/modules/Makefile_geolocation.mk | 2 +-
src/modules/Makefile_music_control.mk | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 89e6755..db4f585 100644
--- a/configure.ac
+++ b/configure.ac
@@ -910,6 +910,8 @@ define([CHECK_MODULE_WL_DRM],
])
AM_CONDITIONAL([HAVE_WL_DRM], [test "x${WL_DRM}" = "xtrue"])
+EFL_WITH_BIN([eldbus], [eldbus_codegen], [eldbus-codegen])
+
AC_E_OPTIONAL_MODULE([ibar], true)
AC_E_OPTIONAL_MODULE([clock], true)
AC_E_OPTIONAL_MODULE([pager], true)
@@ -1116,6 +1118,7 @@ Summary:
* prefix..........: $(txt_strip $prefix)
* CFLAGS..........: $(txt_strip $CFLAGS)
* LDFLAGS.........: $(txt_strip $LDFLAGS)
+ * eldbus_codegen..: ${eldbus_codegen}
SUMMARY_EOF
if test "$have_systemd_user_session" = "yes"; then
diff --git a/src/modules/Makefile_geolocation.mk
b/src/modules/Makefile_geolocation.mk
index f73fc01..6b0966c 100644
--- a/src/modules/Makefile_geolocation.mk
+++ b/src/modules/Makefile_geolocation.mk
@@ -24,7 +24,7 @@ MAINTAINERCLEANFILES += $(GEO_GEN)
src/modules/geolocation/e_mod_main.c: $(GEO_GEN)
$(GEO_GEN): src/modules/geolocation/org.freedesktop.GeoClue2.xml
@cd $(top_builddir)/src/modules/geolocation && \
- eldbus-codegen
$(abs_top_srcdir)/src/modules/geolocation/org.freedesktop.GeoClue2.xml
+ @eldbus_codegen@
$(abs_top_srcdir)/src/modules/geolocation/org.freedesktop.GeoClue2.xml
src_modules_geolocation_module_la_LIBADD = $(MOD_LIBS)
src_modules_geolocation_module_la_CPPFLAGS =
-I$(top_builddir)/src/modules/geolocation $(MOD_CPPFLAGS)
diff --git a/src/modules/Makefile_music_control.mk
b/src/modules/Makefile_music_control.mk
index 8374376..d2d612b 100644
--- a/src/modules/Makefile_music_control.mk
+++ b/src/modules/Makefile_music_control.mk
@@ -18,7 +18,7 @@ MAINTAINERCLEANFILES += $(MUSIC_GEN)
src/modules/music-control/e_mod_main.c: $(MUSIC_GEN)
$(MUSIC_GEN): src/modules/music-control/introspect.xml
@cd $(top_builddir)/src/modules/music-control && \
- eldbus-codegen
$(abs_top_srcdir)/src/modules/music-control/introspect.xml
+ @eldbus_codegen@
$(abs_top_srcdir)/src/modules/music-control/introspect.xml
music_controlpkgdir = $(MDIR)/music-control/$(MODULE_ARCH)
music_controlpkg_LTLIBRARIES = src/modules/music-control/module.la
--
