diff options
| author | Cedric BAIL <cedric.bail@samsung.com> | 2015-01-26 15:48:39 +0100 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-02-16 14:47:47 +0100 |
| commit | 516fa339c44986f07270ad118de15ab455923c8b (patch) | |
| tree | d163a2625c6b6b1abb7097f78660bb19d3a080f1 | |
| parent | 331a70313eaae292c8cd5f2484a6e18d259e223d (diff) | |
| download | efl-516fa339c44986f07270ad118de15ab455923c8b.tar.gz | |
efl: autotools - move Eet section after Eo.
| -rw-r--r-- | configure.ac | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 098aac7b92..c866e4507d 100644 --- a/configure.ac +++ b/configure.ac @@ -969,7 +969,6 @@ EFL_ADD_FEATURE([EINA], [systemd-journal], [${want_systemd}]) EFL_LIB_END([Eina]) #### End of Eina - #### Eina CXX EFL_LIB_START([Eina_Cxx]) @@ -993,9 +992,9 @@ EFL_EVAL_PKGS([EINA_CXX]) EFL_LIB_END([Eina_Cxx]) #### End of Eina CXX -#### Eet +#### Eo -EFL_LIB_START([Eet]) +EFL_LIB_START([Eo]) ### Default values @@ -1003,25 +1002,17 @@ EFL_LIB_START([Eet]) ### Checks for programs -### Checks for libraries - ## Compatibility layers -EFL_PLATFORM_DEPEND([EET], [evil]) - -EFL_ADD_LIBS([EET], [-lm]) - -# Cryptography support -if test "$build_crypto" != "none" ; then - AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet]) - AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file]) - EFL_CRYPTO_DEPEND([EET]) -fi +EFL_PLATFORM_DEPEND([EO], [evil]) -EFL_CHECK_LIBS([EET], [libjpeg zlib]) +### Checks for libraries +EFL_INTERNAL_DEPEND_PKG([EO], [eina]) -EFL_INTERNAL_DEPEND_PKG([EET], [eina]) +# Example (evas one) -EFL_EVAL_PKGS([EET]) +# TODO: add once elementary is merged +#PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) +AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) ### Checks for header files @@ -1037,8 +1028,8 @@ EFL_EVAL_PKGS([EET]) ### Check availability -EFL_LIB_END([Eet]) -#### End of Eet +EFL_LIB_END([Eo]) +#### End of Eo #### Eet CXX EFL_LIB_START([Eet_Cxx]) @@ -1051,9 +1042,9 @@ EFL_EVAL_PKGS([EET_CXX]) EFL_LIB_END([Eet_Cxx]) #### End of Eet CXX -#### Eo +#### Eet -EFL_LIB_START([Eo]) +EFL_LIB_START([Eet]) ### Default values @@ -1061,17 +1052,25 @@ EFL_LIB_START([Eo]) ### Checks for programs +### Checks for libraries + ## Compatibility layers -EFL_PLATFORM_DEPEND([EO], [evil]) +EFL_PLATFORM_DEPEND([EET], [evil]) -### Checks for libraries -EFL_INTERNAL_DEPEND_PKG([EO], [eina]) +EFL_ADD_LIBS([EET], [-lm]) -# Example (evas one) +# Cryptography support +if test "$build_crypto" != "none" ; then + AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet]) + AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file]) + EFL_CRYPTO_DEPEND([EET]) +fi -# TODO: add once elementary is merged -#PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) -AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) +EFL_CHECK_LIBS([EET], [libjpeg zlib]) + +EFL_INTERNAL_DEPEND_PKG([EET], [eina]) + +EFL_EVAL_PKGS([EET]) ### Checks for header files @@ -1088,8 +1087,8 @@ EFL_CHECK_FUNCS([EO], [dladdr]) ### Check availability -EFL_LIB_END([Eo]) -#### End of Eo +EFL_LIB_END([Eet]) +#### End of Eet #### Eo CXX EFL_LIB_START([Eo_Cxx]) |