edje: we do need Eo, so all Efl from trunk is necessary.

SVN revision: 80642
This commit is contained in:
Cedric BAIL 2012-12-11 10:49:53 +00:00
parent 3a27a91046
commit 8d7f3111c8
1 changed files with 26 additions and 24 deletions

View File

@ -224,7 +224,7 @@ AC_SUBST(pkgconfig_requires_private)
EFL_EDJE_BUILD=""
case "$host_os" in
mingw*)
PKG_CHECK_MODULES([EVIL], [evil >= 1.6.99])
PKG_CHECK_MODULES([EVIL], [evil >= 1.7.99])
AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil library is installed])
requirement_edje="evil ${requirement_edje}"
EFL_EDJE_BUILD="-DEFL_EDJE_BUILD"
@ -262,26 +262,28 @@ fi
PKG_CHECK_MODULES([MINIMAL],
[
eina >= 1.6.99
eet >= 1.6.99
eina >= 1.7.99
eo >= 1.7.99
eet >= 1.7.99
])
PKG_CHECK_MODULES([EDJE],
[
eina >= 1.6.99
eet >= 1.6.99
evas >= 1.6.99
ecore >= 1.6.99
ecore-evas >= 1.6.99
ecore-file >= 1.6.99
ecore-input >= 1.6.99
embryo >= 1.6.99
eina >= 1.7.99
eo >= 1.7.99
eet >= 1.7.99
evas >= 1.7.99
ecore >= 1.7.99
ecore-evas >= 1.7.99
ecore-file >= 1.7.99
ecore-input >= 1.7.99
embryo >= 1.7.99
])
EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
requirement_edje="embryo >= 1.6.99 ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 ${requirement_edje}"
requirement_edje="embryo >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 eina >= 1.7.99 ${requirement_edje}"
requirement_edje="${requirement_lua} ${requirement_edje}"
want_ecore_imf="auto"
@ -293,13 +295,13 @@ AC_ARG_ENABLE([ecore-imf],
if test "x${want_ecore_imf}" != "xno"; then
PKG_CHECK_MODULES([ECORE_IMF],
[
ecore-imf >= 1.6.99
ecore-imf-evas >= 1.6.99
ecore-imf >= 1.7.99
ecore-imf-evas >= 1.7.99
],
[
AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry])
have_ecore_imf="yes"
requirement_edje="ecore-imf-evas >= 1.6.99 ecore-imf >= 1.6.99 ${requirement_edje}"
requirement_edje="ecore-imf-evas >= 1.7.99 ecore-imf >= 1.7.99 ${requirement_edje}"
],
[have_ecore_imf="no"])
fi
@ -315,11 +317,11 @@ AC_ARG_ENABLE([eio],
if test "x${want_eio}" != "xno"; then
PKG_CHECK_MODULES([EIO],
[eio >= 1.6.99],
[eio >= 1.7.99],
[
AC_DEFINE([HAVE_EIO], [1], [Eio is available for monitoring file assynchronously])
have_eio="yes"
requirement_edje="eio >= 1.6.99 ${requirement_edje}"
requirement_edje="eio >= 1.7.99 ${requirement_edje}"
],
[have_eio="no"])
fi
@ -504,7 +506,7 @@ AC_SUBST([want_multisense])
if test "x${have_edje_cc}" = "xyes" ; then
PKG_CHECK_MODULES([EDJE_CC],
[ecore-file >= 1.6.99 ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.0 eina >= 1.6.99])
[ecore-file >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99 evas >= 1.7.99 eet >= 1.6.0 eina >= 1.7.99])
EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
fi
@ -512,34 +514,34 @@ AM_CONDITIONAL([BUILD_EPP], [test "x${have_edje_cc}" = "xyes"])
if test "x${have_edje_decc}" = "xyes" ; then
PKG_CHECK_MODULES([EDJE_DECC],
[ecore-file >= 1.6.99 ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99])
[ecore-file >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 eina >= 1.7.99])
fi
if test "x${have_edje_player}" = "xyes" ; then
PKG_CHECK_MODULES([EDJE_PLAYER],
[ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99])
[ecore-evas >= 1.7.99 ecore >= 1.7.99 evas >= 1.7.99 eina >= 1.7.99])
fi
if test "x${have_edje_inspector}" = "xyes" ; then
PKG_CHECK_MODULES([EDJE_INSPECTOR],
[ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99])
[ecore-evas >= 1.7.99 ecore >= 1.7.99 evas >= 1.7.99 eina >= 1.7.99])
fi
if test "x${have_edje_external_inspector}" = "xyes" ; then
PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR],
[ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99])
[ecore >= 1.7.99 evas >= 1.7.99 eina >= 1.7.99])
fi
if test "x${have_edje_watch}" = "xyes" ; then
PKG_CHECK_MODULES([EDJE_WATCH],
[ecore >= 1.6.99 eina >= 1.6.99 eio >= 1.6.99],
[ecore >= 1.7.99 eina >= 1.7.99 eio >= 1.7.99],
[have_edje_watch="yes"],
[have_edje_watch="no"])
fi
if test "x${have_edje_codegen}" = "xyes" ; then
PKG_CHECK_MODULES([EDJE_CODEGEN],
[ecore >= 1.6.99 eina >= 1.6.99],
[ecore >= 1.7.99 eina >= 1.7.99],
[have_edje_codegen="yes"],
[have_edje_codegen="no"])
fi