enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

m4: EFL_WITH_BIN_SUFFIX, make use of it in configure.ac

This commit is contained in:
Daniel Kolesa 2014-06-12 15:20:18 +01:00
parent be0062ab0f
commit 9a4deeafe2
2 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure.ac
View File

@ -147,33 +147,7 @@ efl_deprecated_option="no"
EFL_WITH_BIN([edje], [edje-cc])
EFL_WITH_BIN([eolian], [eolian-gen])
EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
# elua binary - special handling of HAVE_ELUA_BIN
elua_bin=""
_efl_elua_define="no"
AC_ARG_WITH([elua],
[AC_HELP_STRING([--with-elua=PATH], [specify a specific path to elua @<:@default=elua@:>@])],
[
elua_bin=${withval}
_efl_elua_define="yes"
], [])
AC_ARG_WITH([bin-elua],
[AC_HELP_STRING([--with-bin-elua=PATH], [specify a specific path to elua @<:@default=elua@:>@ DEPRECATED])],
[
elua_bin=${withval}
_efl_elua_define="yes"
efl_deprecated_option="yes"
], [])
AC_MSG_NOTICE([elua set to ${elua_bin}])
with_binary_elua=${elua_bin}
AM_CONDITIONAL(HAVE_ELUA_BIN, [test "x${_efl_elua_define}" = "xyes"])
AC_SUBST(elua_bin)
EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
#### Default values
@ -4677,8 +4651,8 @@ if test "x${with_binary_eolian_cxx}" != "x"; then
echo " eolian_cxx....: ${with_binary_eolian_cxx}"
fi
if test "x${with_binary_elua}" != "x"; then
echo " elua..........: ${with_binary_elua}"
if test "x${with_binary_elua_bin}" != "x"; then
echo " elua..........: ${with_binary_elua_bin}"
fi
echo " "

15
m4/efl_binary.m4
View File

@ -1,9 +1,7 @@
dnl Usage: EFL_WITH_BIN(package, binary)
dnl Usage: EFL_WITH_BIN_SUFFIX(package, binary, suffix)
dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
AC_DEFUN([EFL_WITH_BIN],
AC_DEFUN([EFL_WITH_BIN_SUFFIX],
[
m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
@ -31,9 +29,14 @@ AC_ARG_WITH([bin-$2],
DOWN=${_efl_with_binary}
AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
with_binary_[]m4_defn([DOWN])[]$3=${_efl_with_binary}
AM_CONDITIONAL(HAVE_[]UP, [test "x${_efl_binary_define}" = "xyes"])
AM_CONDITIONAL(HAVE_[]UP[]m4_translit([[$3]], [a-z], [A-Z]), [test "x${_efl_binary_define}" = "xyes"])
AC_SUBST(DOWN)
])
dnl Usage: EFL_WITH_BIN(package, binary)
dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
AC_DEFUN([EFL_WITH_BIN], [EFL_WITH_BIN_SUFFIX([$1], [$2], [])])