summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-09-27 04:39:28 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-09-27 04:39:28 +0000
commita9230c1de31b6f99e49203ec6e294dd51c457cbb (patch)
treeb5c4d8ecfd424c068ab2f1612f280734f0add923 /configure.ac
parent8eb2fc8c4ffb519e939c85796e634e06317e1384 (diff)
make eo not an optional build - this WILL be no-option as we will be
based on it. SVN revision: 77124
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac115
1 files changed, 50 insertions, 65 deletions
diff --git a/configure.ac b/configure.ac
index a065c005b7..ecd62286c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,8 +197,6 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
197#### Additional options to configure 197#### Additional options to configure
198 198
199EFL_ENABLE_LIB([eet], [yes]) 199EFL_ENABLE_LIB([eet], [yes])
200EFL_ENABLE_LIB([eo], [no])
201
202 200
203# Assert or fail. 201# Assert or fail.
204 202
@@ -784,6 +782,56 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
784#### End of Eina 782#### End of Eina
785 783
786 784
785#### Eo
786
787AC_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
799requirements_pc_eo="eina >= 1.7.99"
800
801PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
802
803# Example (evas one)
804
805PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
806AM_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
816EFL_EO_BUILD=""
817case "$host_os" in
818 mingw*)
819 EFL_EO_BUILD="-DEFL_EO_BUILD"
820 ;;
821esac
822AC_SUBST([EFL_EO_BUILD])
823
824### Checks for linker characteristics
825
826### Checks for library functions
827
828### Check availability
829
830efl_have_eo="yes"
831
832#### End of Eo
833
834
787#### Eet 835#### Eet
788 836
789efl_have_eet="no" 837efl_have_eet="no"
@@ -1062,8 +1110,6 @@ AC_MSG_RESULT([${have_signature}])
1062 1110
1063EFL_CHECK_LIBS([EET], [libjpeg zlib]) 1111EFL_CHECK_LIBS([EET], [libjpeg zlib])
1064 1112
1065# Eina library
1066
1067requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}" 1113requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}"
1068 1114
1069PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}]) 1115PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
@@ -1141,67 +1187,6 @@ fi
1141 1187
1142#### End of Eet 1188#### End of Eet
1143 1189
1144
1145#### Eo
1146
1147efl_have_eo="no"
1148
1149if test "x${efl_want_build_eo}" = "xyes" ; then
1150
1151AC_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
1163requirements_pc_eo="eina >= 1.7.99"
1164
1165PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
1166
1167# Example (evas one)
1168
1169PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
1170AM_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
1180EFL_EO_BUILD=""
1181case "$host_os" in
1182 mingw*)
1183 EFL_EO_BUILD="-DEFL_EO_BUILD"
1184 ;;
1185esac
1186AC_SUBST([EFL_EO_BUILD])
1187
1188### Checks for linker characteristics
1189
1190### Checks for library functions
1191
1192### Check availability
1193
1194efl_have_eo="yes"
1195
1196else
1197
1198AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false])
1199
1200fi
1201
1202#### End of Eo
1203
1204
1205#### Evas 1190#### Evas
1206 1191
1207#AC_MSG_NOTICE([Evas checks]) 1192#AC_MSG_NOTICE([Evas checks])