summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2015-03-17 08:49:56 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-03-17 09:58:17 +0100
commit0f13052b6ae3e65c7a9fd99bbdb11d240147adbb (patch)
tree09f187319c6df21879a3228b2c2c8f63764651db /configure.ac
parentcf52036667aba359b6b6fecbba8b1e4c605cc527 (diff)
efl: autotools - move Eet section after Eo.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac61
1 files changed, 30 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac
index c88c2f7..c12968b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -961,7 +961,6 @@ EFL_ADD_FEATURE([EINA], [systemd-journal], [${want_systemd}])
961EFL_LIB_END([Eina]) 961EFL_LIB_END([Eina])
962#### End of Eina 962#### End of Eina
963 963
964
965#### Eina CXX 964#### Eina CXX
966EFL_LIB_START([Eina_Cxx]) 965EFL_LIB_START([Eina_Cxx])
967 966
@@ -985,9 +984,9 @@ EFL_EVAL_PKGS([EINA_CXX])
985EFL_LIB_END([Eina_Cxx]) 984EFL_LIB_END([Eina_Cxx])
986#### End of Eina CXX 985#### End of Eina CXX
987 986
988#### Eet 987#### Eo
989 988
990EFL_LIB_START([Eet]) 989EFL_LIB_START([Eo])
991 990
992### Default values 991### Default values
993 992
@@ -995,25 +994,17 @@ EFL_LIB_START([Eet])
995 994
996### Checks for programs 995### Checks for programs
997 996
998### Checks for libraries
999
1000## Compatibility layers 997## Compatibility layers
1001EFL_PLATFORM_DEPEND([EET], [evil]) 998EFL_PLATFORM_DEPEND([EO], [evil])
1002
1003EFL_ADD_LIBS([EET], [-lm])
1004
1005# Cryptography support
1006if test "$build_crypto" != "none" ; then
1007 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
1008 AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file])
1009 EFL_CRYPTO_DEPEND([EET])
1010fi
1011 999
1012EFL_CHECK_LIBS([EET], [libjpeg zlib]) 1000### Checks for libraries
1001EFL_INTERNAL_DEPEND_PKG([EO], [eina])
1013 1002
1014EFL_INTERNAL_DEPEND_PKG([EET], [eina]) 1003# Example (evas one)
1015 1004
1016EFL_EVAL_PKGS([EET]) 1005# TODO: add once elementary is merged
1006#PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
1007AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
1017 1008
1018### Checks for header files 1009### Checks for header files
1019 1010
@@ -1029,8 +1020,8 @@ EFL_EVAL_PKGS([EET])
1029 1020
1030### Check availability 1021### Check availability
1031 1022
1032EFL_LIB_END([Eet]) 1023EFL_LIB_END([Eo])
1033#### End of Eet 1024#### End of Eo
1034 1025
1035#### Eet CXX 1026#### Eet CXX
1036EFL_LIB_START([Eet_Cxx]) 1027EFL_LIB_START([Eet_Cxx])
@@ -1043,9 +1034,9 @@ EFL_EVAL_PKGS([EET_CXX])
1043EFL_LIB_END([Eet_Cxx]) 1034EFL_LIB_END([Eet_Cxx])
1044#### End of Eet CXX 1035#### End of Eet CXX
1045 1036
1046#### Eo 1037#### Eet
1047 1038
1048EFL_LIB_START([Eo]) 1039EFL_LIB_START([Eet])
1049 1040
1050### Default values 1041### Default values
1051 1042
@@ -1053,17 +1044,25 @@ EFL_LIB_START([Eo])
1053 1044
1054### Checks for programs 1045### Checks for programs
1055 1046
1047### Checks for libraries
1048
1056## Compatibility layers 1049## Compatibility layers
1057EFL_PLATFORM_DEPEND([EO], [evil]) 1050EFL_PLATFORM_DEPEND([EET], [evil])
1058 1051
1059### Checks for libraries 1052EFL_ADD_LIBS([EET], [-lm])
1060EFL_INTERNAL_DEPEND_PKG([EO], [eina])
1061 1053
1062# Example (evas one) 1054# Cryptography support
1055if test "$build_crypto" != "none" ; then
1056 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
1057 AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file])
1058 EFL_CRYPTO_DEPEND([EET])
1059fi
1063 1060
1064# TODO: add once elementary is merged 1061EFL_CHECK_LIBS([EET], [libjpeg zlib])
1065#PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) 1062
1066AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) 1063EFL_INTERNAL_DEPEND_PKG([EET], [eina])
1064
1065EFL_EVAL_PKGS([EET])
1067 1066
1068### Checks for header files 1067### Checks for header files
1069 1068
@@ -1080,8 +1079,8 @@ EFL_CHECK_FUNCS([EO], [dladdr])
1080 1079
1081### Check availability 1080### Check availability
1082 1081
1083EFL_LIB_END([Eo]) 1082EFL_LIB_END([Eet])
1084#### End of Eo 1083#### End of Eet
1085 1084
1086#### Eo CXX 1085#### Eo CXX
1087EFL_LIB_START([Eo_Cxx]) 1086EFL_LIB_START([Eo_Cxx])