tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=47f95e4029bf4cc16b62ae89f17736b775594742

commit 47f95e4029bf4cc16b62ae89f17736b775594742
Author: Tom Hacohen <t...@stosb.com>
Date:   Thu Mar 13 08:50:52 2014 +0000

    Eolian: Fix building of .eo files.
    
    It was incorrectly detected that this is an internal build, which caused 
issues.
---
 configure.ac        | 4 +++-
 src/lib/Makefile.am | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b4b146a..b20f949 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,9 +649,11 @@ AC_SUBST(requirement_elm)
 
 EFL_WITH_BIN([eet], [eet-eet], [eet])
 EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
-EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
 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])
+# Force the helper to try external eolian-gen
+AM_CONDITIONAL(HAVE_EOLIAN_GEN, [true])
 
 EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9f2cb9e..15b846a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 CLEANFILES=
 
-include ../../Makefile_Eolian_Helper.am
+include $(top_srcdir)/Makefile_Eolian_Helper.am
 
 AM_CPPFLAGS = \
 -DELM_INTERNAL_API_ARGESFSDFEFC=1 \

-- 


Reply via email to