diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-09-27 04:46:30 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-09-27 04:46:30 +0000 |
commit | 0951e8a9d1618eeef063d5859848aff8aab63432 (patch) | |
tree | d91fd945b177895499ae99799214c1c0dd18ad3a /configure.ac | |
parent | cfafa2dd72317fe7d596bd4cd7ba11fc0cbbb253 (diff) |
Eo IS optional. Sorry, i will fight to have ALL libs being optional
SVN revision: 77126
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 115 |
1 files changed, 65 insertions, 50 deletions
diff --git a/configure.ac b/configure.ac index ecd62286c2..a065c005b7 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -197,6 +197,8 @@ 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], [no]) | ||
201 | |||
200 | 202 | ||
201 | # Assert or fail. | 203 | # Assert or fail. |
202 | 204 | ||
@@ -782,56 +784,6 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big]) | |||
782 | #### End of Eina | 784 | #### End of Eina |
783 | 785 | ||
784 | 786 | ||
785 | #### Eo | ||
786 | |||
787 | AC_MSG_NOTICE([Eo checks]) | ||
788 | |||
789 | ### Default values | ||
790 | |||
791 | ### Additional options to configure | ||
792 | |||
793 | ### Checks for programs | ||
794 | |||
795 | ### Checks for libraries | ||
796 | |||
797 | # Eina library | ||
798 | |||
799 | requirements_pc_eo="eina >= 1.7.99" | ||
800 | |||
801 | PKG_CHECK_MODULES([EO], [${requirements_pc_eo}]) | ||
802 | |||
803 | # Example (evas one) | ||
804 | |||
805 | PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) | ||
806 | AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) | ||
807 | |||
808 | ### Checks for header files | ||
809 | |||
810 | ### Checks for types | ||
811 | |||
812 | ### Checks for structures | ||
813 | |||
814 | ### Checks for compiler characteristics | ||
815 | |||
816 | EFL_EO_BUILD="" | ||
817 | case "$host_os" in | ||
818 | mingw*) | ||
819 | EFL_EO_BUILD="-DEFL_EO_BUILD" | ||
820 | ;; | ||
821 | esac | ||
822 | AC_SUBST([EFL_EO_BUILD]) | ||
823 | |||
824 | ### Checks for linker characteristics | ||
825 | |||
826 | ### Checks for library functions | ||
827 | |||
828 | ### Check availability | ||
829 | |||
830 | efl_have_eo="yes" | ||
831 | |||
832 | #### End of Eo | ||
833 | |||
834 | |||
835 | #### Eet | 787 | #### Eet |
836 | 788 | ||
837 | efl_have_eet="no" | 789 | efl_have_eet="no" |
@@ -1110,6 +1062,8 @@ AC_MSG_RESULT([${have_signature}]) | |||
1110 | 1062 | ||
1111 | EFL_CHECK_LIBS([EET], [libjpeg zlib]) | 1063 | EFL_CHECK_LIBS([EET], [libjpeg zlib]) |
1112 | 1064 | ||
1065 | # Eina library | ||
1066 | |||
1113 | requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}" | 1067 | requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}" |
1114 | 1068 | ||
1115 | PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}]) | 1069 | PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}]) |
@@ -1187,6 +1141,67 @@ fi | |||
1187 | 1141 | ||
1188 | #### End of Eet | 1142 | #### End of Eet |
1189 | 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 | else | ||
1197 | |||
1198 | AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false]) | ||
1199 | |||
1200 | fi | ||
1201 | |||
1202 | #### End of Eo | ||
1203 | |||
1204 | |||
1190 | #### Evas | 1205 | #### Evas |
1191 | 1206 | ||
1192 | #AC_MSG_NOTICE([Evas checks]) | 1207 | #AC_MSG_NOTICE([Evas checks]) |