elm: use edje's provided module arch for externals.

SVN revision: 82978
This commit is contained in:
Gustavo Sverzut Barbieri 2013-01-18 14:17:13 +00:00
parent 1202dbcd58
commit 9f1d979545
1 changed files with 16 additions and 5 deletions

View File

@ -75,23 +75,34 @@ AC_SUBST(VMIN)
# pkg-config
PKG_PROG_PKG_CONFIG
EDJE_VERSION=`$PKG_CONFIG edje --modversion | awk -F . '{printf("%s.%s.%s", $1, $2, $3);}'`
MODULE_EDJE=`pkg-config --variable=module_arch edje`
if test -z "$MODULE_EDJE"; then
# Backward compatibility -- TODO: remove when EFL 1.8 is released.
EDJE_VERSION=`$PKG_CONFIG edje --modversion | awk -F . '{printf("%s.%s.%s", $1, $2, $3);}'`
case "$host_os" in
mingw32ce* | cegcc*)
MODULE_EDJE="$host_os-$host_cpu"
;;
*)
MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
;;
esac
fi
AC_SUBST(MODULE_EDJE)
AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
case "$host_os" in
mingw32ce* | cegcc*)
MODULE_ARCH="$host_os-$host_cpu"
MODULE_EDJE="$host_os-$host_cpu"
;;
*)
MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
;;
esac
AC_SUBST(release_info)
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
AC_SUBST(MODULE_EDJE)
AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
EFL_SHARED_EXTENSION="${shrext_cmds}"
AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension")