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

edje shouldn't automagically detect dependencies. 

distros such as gentoo will rely on actual wanted dependencies and it
sucks to not have a way to forcefully enable or disable a dependency.

Scenario:
 - user installed eio for some weird reason.
 - user compiles edje, which was finding eio. Without user desire.
 - user removes eio because it's not needed anymore.
 - edje is broken.

Most systems will not have this problem because the package is built
on a pristine system where all dependencies are installed, then the
package is compiled and is impossible to have the user to do such
thing. Not on gentoo and others.

And this commit has a second benefit to disable eio until it's
properly fixed for edje_codegen :-)



SVN revision: 76361
This commit is contained in:
Gustavo Sverzut Barbieri 2012-09-10 00:31:16 +00:00
parent 2e09f012a0
commit b28bd3d002
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
legacy/edje/configure.ac
View File

@ -283,27 +283,49 @@ 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="${requirement_lua} ${requirement_edje}"
want_ecore_imf="auto"
have_ecore_imf="no"
PKG_CHECK_MODULES([ECORE_IMF],
[
ecore-imf >= 1.6.99
ecore-imf-evas >= 1.6.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}"
],
[have_ecore_imf="no"])
AC_ARG_ENABLE([ecore-imf],
[AC_HELP_STRING([--disable-ecore-imf], [Disable build with ecore-imf])],
[want_ecore_imf="${enableval}"])
if test "x${want_ecore_imf}" != "xno"; then
PKG_CHECK_MODULES([ECORE_IMF],
[
ecore-imf >= 1.6.99
ecore-imf-evas >= 1.6.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}"
],
[have_ecore_imf="no"])
fi
if test "x${want_ecore_imf}" = "xyes" -a "x${have_ecore_imf}" = "xno"; then
AC_MSG_ERROR([Ecore-IMF required, but not found])
fi
want_eio="auto"
have_eio="no"
AC_ARG_ENABLE([eio],
[AC_HELP_STRING([--disable-eio], [Disable build with eio])],
[want_eio="${enableval}"])
if test "x${want_eio}" != "xno"; then
PKG_CHECK_MODULES([EIO],
[eio >= 1.6.99],
[
AC_DEFINE([HAVE_EIO], [1], [Eio is available for monitoring file assynchronously])
have_eio="yes"
requirement_edje="eio >= 1.6.99 ${requirement_edje}"
],
[have_eio="no"])
fi
if test "x${want_eio}" = "xyes" -a "x${have_eio}" = "xno"; then
AC_MSG_ERROR([Eio required, but not found])
fi
PKG_CHECK_MODULES([EIO],
[eio >= 1.6.99],
[
AC_DEFINE([HAVE_EIO], [1], [Eio is available for monitoring file assynchronously])
have_eio="yes"
requirement_edje="eio >= 1.6.99 ${requirement_edje}"
],
[have_eio="no"])
# Enable Multisense use
want_multisense="no"
@ -619,6 +641,7 @@ echo "Configuration Options Summary:"
echo
echo " Amalgamation.........: ${do_amalgamation}"
echo " Ecore IMF............: $have_ecore_imf"
echo " EIO..................: $have_eio"
dnl echo " Multisense...........: $want_multisense"
if test "x${want_multisense}" = "xyes" ; then