merge: and disable eo for now, as requested by Tom

SVN revision: 77074
This commit is contained in:
Vincent Torri 2012-09-26 07:29:34 +00:00
parent 3b5a3448b7
commit 7871e73b56
2 changed files with 7 additions and 4 deletions

View File

@ -197,7 +197,7 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
#### Additional options to configure
EFL_ENABLE_LIB([eet], [yes])
EFL_ENABLE_LIB([eo], [yes])
EFL_ENABLE_LIB([eo], [no])
# Assert or fail.
@ -1133,7 +1133,7 @@ esac
### Check availability
if test "x${efl_lib_zlib}" = ""xyes" && test "x${efl_lib_libjpeg}" = ""xyes" ; then
if test "x${efl_lib_zlib}" = "xyes" && test "x${efl_lib_libjpeg}" = "xyes" ; then
efl_have_eet="yes"
fi
@ -1193,6 +1193,10 @@ AC_SUBST([EFL_EO_BUILD])
efl_have_eo="yes"
else
AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false])
fi
#### End of Eo

View File

@ -4,8 +4,7 @@ dnl That code is public domain and can be freely used or copied.
dnl Macro that allows an EFL to not be built
dnl Usage: EFL_ENABLE_LIB(lib, want)
dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _)
dnl Define have_lib (- is transformed into _)
dnl Define efl_want_build_lib (- is transformed into _)
dnl Define conditional EFL_BUILD_LIB (LIB is the uppercase of lib, - being transformed into _)
AC_DEFUN([EFL_ENABLE_LIB],