summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2014-06-12 15:20:18 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2014-06-12 15:20:18 +0100
commit9a4deeafe2cf4f5972bf8e777a059b1a6dda0f52 (patch)
tree18404f9ded1414f371118d76d02f41bcd631f94e
parentbe0062ab0f233869803d770fb207e051e9b12619 (diff)
m4: EFL_WITH_BIN_SUFFIX, make use of it in configure.ac
-rw-r--r--configure.ac32
-rw-r--r--m4/efl_binary.m415
2 files changed, 12 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac
index 30ed76f675..7180e1895e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,33 +147,7 @@ efl_deprecated_option="no"
147EFL_WITH_BIN([edje], [edje-cc]) 147EFL_WITH_BIN([edje], [edje-cc])
148EFL_WITH_BIN([eolian], [eolian-gen]) 148EFL_WITH_BIN([eolian], [eolian-gen])
149EFL_WITH_BIN([eolian_cxx], [eolian-cxx]) 149EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
150 150EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
151# elua binary - special handling of HAVE_ELUA_BIN
152
153elua_bin=""
154_efl_elua_define="no"
155
156AC_ARG_WITH([elua],
157 [AC_HELP_STRING([--with-elua=PATH], [specify a specific path to elua @<:@default=elua@:>@])],
158 [
159 elua_bin=${withval}
160 _efl_elua_define="yes"
161 ], [])
162
163AC_ARG_WITH([bin-elua],
164 [AC_HELP_STRING([--with-bin-elua=PATH], [specify a specific path to elua @<:@default=elua@:>@ DEPRECATED])],
165 [
166 elua_bin=${withval}
167 _efl_elua_define="yes"
168 efl_deprecated_option="yes"
169 ], [])
170
171AC_MSG_NOTICE([elua set to ${elua_bin}])
172
173with_binary_elua=${elua_bin}
174
175AM_CONDITIONAL(HAVE_ELUA_BIN, [test "x${_efl_elua_define}" = "xyes"])
176AC_SUBST(elua_bin)
177 151
178#### Default values 152#### Default values
179 153
@@ -4677,8 +4651,8 @@ if test "x${with_binary_eolian_cxx}" != "x"; then
4677echo " eolian_cxx....: ${with_binary_eolian_cxx}" 4651echo " eolian_cxx....: ${with_binary_eolian_cxx}"
4678fi 4652fi
4679 4653
4680if test "x${with_binary_elua}" != "x"; then 4654if test "x${with_binary_elua_bin}" != "x"; then
4681echo " elua..........: ${with_binary_elua}" 4655echo " elua..........: ${with_binary_elua_bin}"
4682fi 4656fi
4683 4657
4684echo " " 4658echo " "
diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
index a86a41d101..3a811f8c11 100644
--- a/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
@@ -1,9 +1,7 @@
1 1dnl Usage: EFL_WITH_BIN_SUFFIX(package, binary, suffix)
2
3dnl Usage: EFL_WITH_BIN(package, binary)
4dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user) 2dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
5 3
6AC_DEFUN([EFL_WITH_BIN], 4AC_DEFUN([EFL_WITH_BIN_SUFFIX],
7[ 5[
8 6
9m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl 7m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
@@ -31,9 +29,14 @@ AC_ARG_WITH([bin-$2],
31DOWN=${_efl_with_binary} 29DOWN=${_efl_with_binary}
32AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}]) 30AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
33 31
34with_binary_[]m4_defn([DOWN])=${_efl_with_binary} 32with_binary_[]m4_defn([DOWN])[]$3=${_efl_with_binary}
35 33
36AM_CONDITIONAL(HAVE_[]UP, [test "x${_efl_binary_define}" = "xyes"]) 34AM_CONDITIONAL(HAVE_[]UP[]m4_translit([[$3]], [a-z], [A-Z]), [test "x${_efl_binary_define}" = "xyes"])
37AC_SUBST(DOWN) 35AC_SUBST(DOWN)
38 36
39]) 37])
38
39dnl Usage: EFL_WITH_BIN(package, binary)
40dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
41
42AC_DEFUN([EFL_WITH_BIN], [EFL_WITH_BIN_SUFFIX([$1], [$2], [])])