diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-09-26 06:56:52 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-09-26 06:56:52 +0000 |
commit | 3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6 (patch) | |
tree | 18ad8a6b1841e9832c85a46f887b2cd6d6dacc4b /configure.ac | |
parent | 195d31c73fef88cfaa803b07b2ae3cba983a4093 (diff) |
merge: add eo
SVN revision: 77072
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 77 |
1 files changed, 75 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a957637542..380b8fda85 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -51,8 +51,6 @@ AC_SUBST([VMAJ]) | |||
51 | 51 | ||
52 | #### Default values | 52 | #### Default values |
53 | 53 | ||
54 | want_eina="yes" | ||
55 | want_eet="yes" | ||
56 | want_evas="yes" | 54 | want_evas="yes" |
57 | want_ecore="yes" | 55 | want_ecore="yes" |
58 | want_embryo="yes" | 56 | want_embryo="yes" |
@@ -97,6 +95,7 @@ requirements_libs_deps_elementary="" | |||
97 | 95 | ||
98 | requirements_pc_eina="" | 96 | requirements_pc_eina="" |
99 | requirements_pc_eet="" | 97 | requirements_pc_eet="" |
98 | requirements_pc_eo="" | ||
100 | requirements_pc_evas="" | 99 | requirements_pc_evas="" |
101 | requirements_pc_ecore="" | 100 | requirements_pc_ecore="" |
102 | requirements_pc_embryo="" | 101 | requirements_pc_embryo="" |
@@ -140,6 +139,7 @@ AC_SUBST([requirements_libs_elementary]) | |||
140 | 139 | ||
141 | AC_SUBST([requirements_pc_eina]) | 140 | AC_SUBST([requirements_pc_eina]) |
142 | AC_SUBST([requirements_pc_eet]) | 141 | AC_SUBST([requirements_pc_eet]) |
142 | AC_SUBST([requirements_pc_eo]) | ||
143 | AC_SUBST([requirements_pc_evas]) | 143 | AC_SUBST([requirements_pc_evas]) |
144 | AC_SUBST([requirements_pc_ecore]) | 144 | AC_SUBST([requirements_pc_ecore]) |
145 | AC_SUBST([requirements_pc_embryo]) | 145 | AC_SUBST([requirements_pc_embryo]) |
@@ -197,6 +197,7 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"]) | |||
197 | #### Additional options to configure | 197 | #### Additional options to configure |
198 | 198 | ||
199 | EFL_ENABLE_LIB([eet], [yes]) | 199 | EFL_ENABLE_LIB([eet], [yes]) |
200 | EFL_ENABLE_LIB([eo], [yes]) | ||
200 | 201 | ||
201 | 202 | ||
202 | # Assert or fail. | 203 | # Assert or fail. |
@@ -1141,6 +1142,62 @@ fi | |||
1141 | #### End of Eet | 1142 | #### End of Eet |
1142 | 1143 | ||
1143 | 1144 | ||
1145 | #### Eo | ||
1146 | |||
1147 | efl_have_eo="no" | ||
1148 | |||
1149 | if test "x${efl_want_build_eo}" = "xyes" ; then | ||
1150 | |||
1151 | AC_MSG_NOTICE([Eo checks]) | ||
1152 | |||
1153 | ### Default values | ||
1154 | |||
1155 | ### Additional options to configure | ||
1156 | |||
1157 | ### Checks for programs | ||
1158 | |||
1159 | ### Checks for libraries | ||
1160 | |||
1161 | # Eina library | ||
1162 | |||
1163 | requirements_pc_eo="eina >= 1.7.99" | ||
1164 | |||
1165 | PKG_CHECK_MODULES([EO], [${requirements_pc_eo}]) | ||
1166 | |||
1167 | # Example (evas one) | ||
1168 | |||
1169 | PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) | ||
1170 | AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) | ||
1171 | |||
1172 | ### Checks for header files | ||
1173 | |||
1174 | ### Checks for types | ||
1175 | |||
1176 | ### Checks for structures | ||
1177 | |||
1178 | ### Checks for compiler characteristics | ||
1179 | |||
1180 | EFL_EO_BUILD="" | ||
1181 | case "$host_os" in | ||
1182 | mingw*) | ||
1183 | EFL_EO_BUILD="-DEFL_EO_BUILD" | ||
1184 | ;; | ||
1185 | esac | ||
1186 | AC_SUBST([EFL_EO_BUILD]) | ||
1187 | |||
1188 | ### Checks for linker characteristics | ||
1189 | |||
1190 | ### Checks for library functions | ||
1191 | |||
1192 | ### Check availability | ||
1193 | |||
1194 | efl_have_eo="yes" | ||
1195 | |||
1196 | fi | ||
1197 | |||
1198 | #### End of Eo | ||
1199 | |||
1200 | |||
1144 | #### Evas | 1201 | #### Evas |
1145 | 1202 | ||
1146 | #AC_MSG_NOTICE([Evas checks]) | 1203 | #AC_MSG_NOTICE([Evas checks]) |
@@ -1166,12 +1223,14 @@ doc/Doxyfile | |||
1166 | src/Makefile | 1223 | src/Makefile |
1167 | src/benchmarks/Makefile | 1224 | src/benchmarks/Makefile |
1168 | src/benchmarks/eina/Makefile | 1225 | src/benchmarks/eina/Makefile |
1226 | src/benchmarks/eo/Makefile | ||
1169 | src/bin/Makefile | 1227 | src/bin/Makefile |
1170 | src/bin/evil/Makefile | 1228 | src/bin/evil/Makefile |
1171 | src/bin/eet/Makefile | 1229 | src/bin/eet/Makefile |
1172 | src/examples/Makefile | 1230 | src/examples/Makefile |
1173 | src/examples/eina/Makefile | 1231 | src/examples/eina/Makefile |
1174 | src/examples/eet/Makefile | 1232 | src/examples/eet/Makefile |
1233 | src/examples/eo/Makefile | ||
1175 | src/include/Makefile | 1234 | src/include/Makefile |
1176 | src/include/eina/Makefile | 1235 | src/include/eina/Makefile |
1177 | src/include/eina/eina_config.h | 1236 | src/include/eina/eina_config.h |
@@ -1179,6 +1238,7 @@ src/lib/Makefile | |||
1179 | src/lib/evil/Makefile | 1238 | src/lib/evil/Makefile |
1180 | src/lib/eina/Makefile | 1239 | src/lib/eina/Makefile |
1181 | src/lib/eet/Makefile | 1240 | src/lib/eet/Makefile |
1241 | src/lib/eo/Makefile | ||
1182 | src/modules/Makefile | 1242 | src/modules/Makefile |
1183 | src/modules/eina/Makefile | 1243 | src/modules/eina/Makefile |
1184 | src/modules/eina/mp/Makefile | 1244 | src/modules/eina/mp/Makefile |
@@ -1194,11 +1254,13 @@ src/scripts/eina/Makefile | |||
1194 | src/tests/Makefile | 1254 | src/tests/Makefile |
1195 | src/tests/eina/Makefile | 1255 | src/tests/eina/Makefile |
1196 | src/tests/eet/Makefile | 1256 | src/tests/eet/Makefile |
1257 | src/tests/eo/Makefile | ||
1197 | eina.spec | 1258 | eina.spec |
1198 | eet.spec | 1259 | eet.spec |
1199 | evil.pc | 1260 | evil.pc |
1200 | eina.pc | 1261 | eina.pc |
1201 | eet.pc | 1262 | eet.pc |
1263 | eo.pc | ||
1202 | ]) | 1264 | ]) |
1203 | 1265 | ||
1204 | AC_OUTPUT | 1266 | AC_OUTPUT |
@@ -1263,6 +1325,7 @@ echo " Pass through.......: ${enable_pass_through}" | |||
1263 | echo | 1325 | echo |
1264 | if test "x${efl_have_eet}" = "xno" ; then | 1326 | if test "x${efl_have_eet}" = "xno" ; then |
1265 | echo "Eet....................: no" | 1327 | echo "Eet....................: no" |
1328 | echo | ||
1266 | else | 1329 | else |
1267 | echo "Eet" | 1330 | echo "Eet" |
1268 | echo | 1331 | echo |
@@ -1278,6 +1341,16 @@ echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" | |||
1278 | echo " Examples.............: make examples" | 1341 | echo " Examples.............: make examples" |
1279 | echo " installation.......: make install-examples" | 1342 | echo " installation.......: make install-examples" |
1280 | fi | 1343 | fi |
1344 | if test "x${efl_have_eo}" = "xno" ; then | ||
1345 | echo "Eo.....................: no" | ||
1346 | echo | ||
1347 | else | ||
1348 | echo "Eo" | ||
1349 | echo | ||
1350 | echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" | ||
1351 | echo " Examples.............: make examples" | ||
1352 | echo " installation.......: make install-examples" | ||
1353 | fi | ||
1281 | echo | 1354 | echo |
1282 | echo "Compilation............: make (or gmake)" | 1355 | echo "Compilation............: make (or gmake)" |
1283 | echo " CPPFLAGS.............: $CPPFLAGS" | 1356 | echo " CPPFLAGS.............: $CPPFLAGS" |