summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
commit851975dbcccdf4c70689a9d8c2fa7359fb6cc89e (patch)
treeca1fad45795a8d325c706681334c9df3d301d50c /configure.ac
parent58f5ec5047fcc32540176c3d4f0f4e3b959fddea (diff)
merge : remove useless CONDITIONALs and make eet build optional; eina is always built
SVN revision: 77026
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac20
1 files changed, 19 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d1bb640c61..a957637542 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,6 +196,9 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
196 196
197#### Additional options to configure 197#### Additional options to configure
198 198
199EFL_ENABLE_LIB([eet], [yes])
200
201
199# Assert or fail. 202# Assert or fail.
200 203
201AC_ARG_ENABLE([assert], 204AC_ARG_ENABLE([assert],
@@ -782,6 +785,10 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
782 785
783#### Eet 786#### Eet
784 787
788efl_have_eet="no"
789
790if test "x${efl_want_build_eet}" = "xyes" ; then
791
785AC_MSG_NOTICE([Eet checks]) 792AC_MSG_NOTICE([Eet checks])
786 793
787### Default values 794### Default values
@@ -1123,6 +1130,14 @@ esac
1123 1130
1124### Checks for library functions 1131### Checks for library functions
1125 1132
1133### Check availability
1134
1135if test "x${efl_lib_zlib}" = ""xyes" && test "x${efl_lib_libjpeg}" = ""xyes" ; then
1136 efl_have_eet="yes"
1137fi
1138
1139fi
1140
1126#### End of Eet 1141#### End of Eet
1127 1142
1128 1143
@@ -1246,6 +1261,9 @@ echo " Fixed bitmap.......: ${enable_fixed_bitmap}"
1246echo " One big............: ${enable_one_big}" 1261echo " One big............: ${enable_one_big}"
1247echo " Pass through.......: ${enable_pass_through}" 1262echo " Pass through.......: ${enable_pass_through}"
1248echo 1263echo
1264if test "x${efl_have_eet}" = "xno" ; then
1265echo "Eet....................: no"
1266else
1249echo "Eet" 1267echo "Eet"
1250echo 1268echo
1251echo " Secure layer.........: ${secure_layer}" 1269echo " Secure layer.........: ${secure_layer}"
@@ -1259,6 +1277,7 @@ echo
1259echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" 1277echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
1260echo " Examples.............: make examples" 1278echo " Examples.............: make examples"
1261echo " installation.......: make install-examples" 1279echo " installation.......: make install-examples"
1280fi
1262echo 1281echo
1263echo "Compilation............: make (or gmake)" 1282echo "Compilation............: make (or gmake)"
1264echo " CPPFLAGS.............: $CPPFLAGS" 1283echo " CPPFLAGS.............: $CPPFLAGS"
@@ -1269,4 +1288,3 @@ echo
1269echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" 1288echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
1270echo " prefix...............: $prefix" 1289echo " prefix...............: $prefix"
1271echo 1290echo
1272