summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-30 18:08:55 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-30 18:08:55 +0000
commit1f423eb8e743fbaf0d3e014616daaa356b413f1d (patch)
tree3da0dcd01874a532b55385c643a7d50637c2028d /configure.ac
parentfb27484376f64ab229020c70cf21ca4fc56be092 (diff)
efl/configure: simplify configure.ac
more macros to aid common tasks, make it easier to read. SVN revision: 81904
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac426
1 files changed, 188 insertions, 238 deletions
diff --git a/configure.ac b/configure.ac
index 36ee52b..3804877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,9 +136,15 @@ platform_libs_evil=""
136platform_libs_escape="" 136platform_libs_escape=""
137platform_libs_exotic="" 137platform_libs_exotic=""
138 138
139platform_cflags=""
140platform_cflags_evil=""
141platform_cflags_escape=""
142platform_cflags_exotic=""
143
139requirements_pc_crypto="" 144requirements_pc_crypto=""
140requirements_pc_deps_crypto="" 145requirements_pc_deps_crypto=""
141requirements_libs_crypto="" 146requirements_libs_crypto=""
147requirements_cflags_crypto=""
142 148
143AC_CANONICAL_HOST 149AC_CANONICAL_HOST
144 150
@@ -346,6 +352,7 @@ case "$build_crypto" in
346 AC_PATH_GENERIC([libgcrypt], [], [:], 352 AC_PATH_GENERIC([libgcrypt], [], [:],
347 [AC_MSG_ERROR([libgcrypt required but not found])]) 353 [AC_MSG_ERROR([libgcrypt required but not found])])
348 requirements_libs_crypto="${LIBGCRYPT_LIBS} ${requirements_libs_crypto}" 354 requirements_libs_crypto="${LIBGCRYPT_LIBS} ${requirements_libs_crypto}"
355 requirements_cflags_crypto="${LIBGCRYPT_CFLAGS} ${requirements_cflags_crypto}"
349 ;; 356 ;;
350 357
351 openssl) 358 openssl)
@@ -587,9 +594,8 @@ else
587 EVIL_LIBS="-lole32 -lws2_32 -lsecur32 -luuid" 594 EVIL_LIBS="-lole32 -lws2_32 -lsecur32 -luuid"
588 EVIL_DLFCN_LIBS="-lpsapi" 595 EVIL_DLFCN_LIBS="-lpsapi"
589fi 596fi
590requirements_libs_evil="${EVIL_LIBS}" 597EFL_ADD_LIBS([EVIL], [${EVIL_LIBS}])
591 598
592AC_SUBST([EVIL_LIBS])
593AC_SUBST([EVIL_DLFCN_LIBS]) 599AC_SUBST([EVIL_DLFCN_LIBS])
594 600
595### Checks for header files 601### Checks for header files
@@ -612,7 +618,6 @@ fi
612 618
613AC_SUBST([EVIL_CPPFLAGS]) 619AC_SUBST([EVIL_CPPFLAGS])
614AC_SUBST([EVIL_DLFCN_CPPFLAGS]) 620AC_SUBST([EVIL_DLFCN_CPPFLAGS])
615AC_SUBST([EVIL_CFLAGS])
616AC_SUBST([EVIL_CXXFLAGS]) 621AC_SUBST([EVIL_CXXFLAGS])
617 622
618### Checks for linker characteristics 623### Checks for linker characteristics
@@ -637,7 +642,6 @@ EFL_LIB_END_OPTIONAL([Evil])
637 642
638AC_SUBST([USE_EVIL_CFLAGS]) 643AC_SUBST([USE_EVIL_CFLAGS])
639AC_SUBST([USE_EVIL_LIBS]) 644AC_SUBST([USE_EVIL_LIBS])
640
641#### End of Evil 645#### End of Evil
642 646
643 647
@@ -655,11 +659,7 @@ EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"])
655### Checks for programs 659### Checks for programs
656 660
657### Checks for libraries 661### Checks for libraries
658 662EFL_ADD_LIBS([ESCAPE], [-llv2])
659ESCAPE_LIBS="-llv2"
660requirements_libs_escape="${ESCAPE_LIBS}"
661
662AC_SUBST([ESCAPE_LIBS])
663 663
664### Checks for header files 664### Checks for header files
665 665
@@ -747,7 +747,7 @@ AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
747### Checks for libraries 747### Checks for libraries
748 748
749## Compatibility layers 749## Compatibility layers
750requirements_pc_eina="${requirements_pc_eina} ${platform_pc}" 750EFL_PLATFORM_DEPEND([EINA], [all])
751 751
752## Options 752## Options
753 753
@@ -763,9 +763,7 @@ AC_DEFINE_IF([EINA_DEBUG_MALLOC],
763 [test "x${ac_cv_func_malloc_usable_size}" = "xyes" && test "x${want_debug_malloc}" = "xyes"], 763 [test "x${ac_cv_func_malloc_usable_size}" = "xyes" && test "x${want_debug_malloc}" = "xyes"],
764 [1], [Turn on debugging overhead in mempool]) 764 [1], [Turn on debugging overhead in mempool])
765 765
766if ! test "x${requirements_pc_deps_eina}" = "x" ; then 766EFL_EVAL_PKGS([EINA])
767 PKG_CHECK_MODULES([EINA], [${requirements_pc_deps_eina}])
768fi
769 767
770## Examples 768## Examples
771 769
@@ -863,13 +861,8 @@ EFL_LIB_START([Eet])
863### Checks for libraries 861### Checks for libraries
864 862
865## Compatibility layers 863## Compatibility layers
866requirements_pc_eet="${requirements_pc_eet} ${platform_pc_evil}" 864EFL_PLATFORM_DEPEND([EET], [evil])
867 865EFL_CRYPTO_DEPEND([EET])
868## Secure layer
869
870requirements_pc_eet="${requirements_pc_crypto} ${requirements_pc_eet}"
871requirements_pc_deps_eet="${requirements_pc_deps_crypto} ${requirements_pc_deps_eet}"
872requirements_libs_eet="${requirements_libs_crypto} ${requirements_libs_eet}"
873 866
874# Cryptography support 867# Cryptography support
875if test "$build_crypto" != "none" ; then 868if test "$build_crypto" != "none" ; then
@@ -886,17 +879,9 @@ if test "x${efl_lib_zlib}" != "xyes" || test "x${efl_lib_libjpeg}" != "xyes" ; t
886 AC_MSG_ERROR([Required EET libraries were not found.]) 879 AC_MSG_ERROR([Required EET libraries were not found.])
887fi 880fi
888 881
882EFL_INTERNAL_DEPEND_PKG([EET], [eina])
889 883
890# Eina library 884EFL_EVAL_PKGS([EET])
891
892requirements_pc_eet="eina >= ${PACKAGE_VERSION} ${requirements_pc_eet}"
893
894PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
895
896# Windows
897requirements_libs_eet="${requirements_libs_eet} ${platform_libs}"
898
899EET_LIBS="${EET_LIBS} ${requirements_libs_eet}"
900 885
901### Checks for header files 886### Checks for header files
902 887
@@ -935,15 +920,7 @@ EFL_LIB_START([Eo])
935### Checks for programs 920### Checks for programs
936 921
937### Checks for libraries 922### Checks for libraries
938 923EFL_INTERNAL_DEPEND_PKG([EO], [eina])
939# Eina library
940
941requirements_pc_eo="eina >= ${PACKAGE_VERSION}"
942
943AC_ARG_VAR([EO_CFLAGS], [preprocessor flags for Eo])
944AC_SUBST([EO_CFLAGS])
945AC_ARG_VAR([EO_LIBS], [linker flags for Eo])
946AC_SUBST([EO_LIBS])
947 924
948# Example (evas one) 925# Example (evas one)
949 926
@@ -1336,7 +1313,7 @@ if test "${have_wince}" = "yes"; then
1336fi 1313fi
1337 1314
1338EFL_CHECK_FUNC([DLSYM], [dlsym]) 1315EFL_CHECK_FUNC([DLSYM], [dlsym])
1339requirements_libs_evas="${requirements_libs_evas} ${DLSYM_LIBS}" 1316EFL_ADD_LIBS([EVAS], [${DLSYM_LIBS}])
1340 1317
1341if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then 1318if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then
1342 AC_MSG_ERROR([OpenGL cannot work without dlsym()]) 1319 AC_MSG_ERROR([OpenGL cannot work without dlsym()])
@@ -1347,32 +1324,31 @@ fi
1347### Checks for libraries 1324### Checks for libraries
1348 1325
1349## Compatibility layers 1326## Compatibility layers
1350requirements_pc_evas="${requirements_pc_evas} ${platform_pc}" 1327EFL_PLATFORM_DEPEND([EVAS], [all])
1351 1328EFL_INTERNAL_DEPEND_PKG([EVAS], [eo])
1352# Eina, Eo and Eet libraries 1329EFL_INTERNAL_DEPEND_PKG([EVAS], [eet])
1353 1330EFL_INTERNAL_DEPEND_PKG([EVAS], [eina])
1354requirements_pc_evas="eo >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_evas}"
1355 1331
1356# Freetype 1332# Freetype
1357EFL_DEPEND_PKG([evas], [FREETYPE], [freetype2 >= 9.3.0]) 1333EFL_DEPEND_PKG([EVAS], [FREETYPE], [freetype2 >= 9.3.0])
1358 1334
1359## optional dependencies 1335## optional dependencies
1360 1336
1361# FontConfig 1337# FontConfig
1362EFL_OPTIONAL_DEPEND_PKG([evas], [${want_fontconfig}], 1338EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_fontconfig}],
1363 [FONTCONFIG], [fontconfig >= 2.5.0]) 1339 [FONTCONFIG], [fontconfig >= 2.5.0])
1364 1340
1365# fribidi support 1341# fribidi support
1366EFL_OPTIONAL_DEPEND_PKG([evas], [${want_fribidi}], 1342EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_fribidi}],
1367 [FRIBIDI], [fribidi >= 0.19.2]) 1343 [FRIBIDI], [fribidi >= 0.19.2])
1368 1344
1369# harfbuzz support 1345# harfbuzz support
1370have_harfbuzz_ft="no" 1346have_harfbuzz_ft="no"
1371EFL_OPTIONAL_DEPEND_PKG([evas], [${want_harfbuzz}], 1347EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_harfbuzz}],
1372 [HARFBUZZ], [harfbuzz >= 0.9.0]) 1348 [HARFBUZZ], [harfbuzz >= 0.9.0])
1373 1349
1374# Pixman 1350# Pixman
1375EFL_OPTIONAL_DEPEND_PKG([evas], [${want_pixman}], [PIXMAN], [pixman-1]) 1351EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_pixman}], [PIXMAN], [pixman-1])
1376 1352
1377if test "x${have_pixman}" = "xyes" ; then 1353if test "x${have_pixman}" = "xyes" ; then
1378 if test "x${have_pixman_font}" = "xyes" ; then 1354 if test "x${have_pixman_font}" = "xyes" ; then
@@ -1598,9 +1574,7 @@ fi
1598 1574
1599AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"]) 1575AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"])
1600 1576
1601PKG_CHECK_MODULES([EVAS], [${requirements_pc_deps_evas}]) 1577EFL_EVAL_PKGS([EVAS])
1602
1603EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_evas}"
1604 1578
1605### Checks for header files 1579### Checks for header files
1606 1580
@@ -1727,18 +1701,8 @@ EFL_LIB_START([Embryo])
1727### Checks for programs 1701### Checks for programs
1728 1702
1729### Checks for libraries 1703### Checks for libraries
1730 1704EFL_PLATFORM_DEPEND([EMBRYO], [all])
1731## Compatibility layers 1705EFL_INTERNAL_DEPEND_PKG([EMBRYO], [eina])
1732requirements_pc_embryo="${requirements_pc_embryo} ${platform_pc}"
1733
1734# Eina library
1735
1736requirements_pc_embryo="eina >= ${PACKAGE_VERSION} ${requirements_pc_embryo}"
1737
1738AC_ARG_VAR([EMBRYO_CFLAGS], [preprocessor flags for Embryo])
1739AC_SUBST([EMBRYO_CFLAGS])
1740AC_ARG_VAR([EMBRYO_LIBS], [linker flags for Embryo])
1741AC_SUBST([EMBRYO_LIBS])
1742 1706
1743### Checks for header files 1707### Checks for header files
1744 1708
@@ -1822,17 +1786,13 @@ fi
1822### Checks for programs 1786### Checks for programs
1823 1787
1824### Checks for libraries 1788### Checks for libraries
1825 1789EFL_PLATFORM_DEPEND([ECORE], [all])
1826## Compatibility layers 1790EFL_INTERNAL_DEPEND_PKG([ECORE], [eo])
1827requirements_pc_ecore="${requirements_pc_ecore} ${platform_pc}" 1791EFL_INTERNAL_DEPEND_PKG([ECORE], [eina])
1828
1829# Eina, Eo libraries
1830
1831requirements_pc_ecore="eo >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore}"
1832 1792
1833# glib 1793# glib
1834 1794
1835EFL_OPTIONAL_DEPEND_PKG([ecore], [${want_glib}], [GLIB], [glib-2.0]) 1795EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_glib}], [GLIB], [glib-2.0])
1836if test "x${have_glib}" = "xno"; then 1796if test "x${have_glib}" = "xno"; then
1837 want_g_main_loop="no" 1797 want_g_main_loop="no"
1838fi 1798fi
@@ -1847,11 +1807,9 @@ if test "x${want_g_main_loop}" = "xyes" ; then
1847 AC_DEFINE([USE_G_MAIN_LOOP], [1], [Use g_main_loop in ecore]) 1807 AC_DEFINE([USE_G_MAIN_LOOP], [1], [Use g_main_loop in ecore])
1848fi 1808fi
1849 1809
1850if ! test "x${requirements_pc_deps_ecore}" = "x" ; then 1810EFL_EVAL_PKGS([ECORE])
1851 PKG_CHECK_MODULES([ECORE], [${requirements_pc_deps_ecore}])
1852fi
1853 1811
1854requirements_libs_ecore="${requirements_libs_ecore} ${platform_libs}" 1812EFL_ADD_LIBS([ECORE], [${platform_libs}])
1855 1813
1856### Checks for header files 1814### Checks for header files
1857 1815
@@ -1907,12 +1865,12 @@ AC_CHECK_FUNCS_ONCE([mallinfo timerfd_create clock_gettime])
1907if ! test "x${ac_cv_func_clock_gettime}" = "xyes" ; then 1865if ! test "x${ac_cv_func_clock_gettime}" = "xyes" ; then
1908 AC_CHECK_LIB([rt], [clock_gettime], 1866 AC_CHECK_LIB([rt], [clock_gettime],
1909 [ 1867 [
1910 requirements_libs_ecore="${requirements_libs_ecore} -lrt" 1868 EFL_ADD_LIBS([ECORE], [-lrt])
1911 AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Have clock_gettime()]) 1869 AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Have clock_gettime()])
1912 ]) 1870 ])
1913fi 1871fi
1914 1872
1915ECORE_LIBS="${ECORE_LIBS} ${LTLIBINTL} ${requirements_libs_ecore}" 1873EFL_ADD_LIBS([ECORE], [${LTLIBINTL}])
1916 1874
1917### Check availability 1875### Check availability
1918 1876
@@ -1971,34 +1929,20 @@ AC_DEFINE_IF([HAVE_ABSTRACT_SOCKETS],
1971### Checks for programs 1929### Checks for programs
1972 1930
1973### Checks for libraries 1931### Checks for libraries
1974requirements_pc_ecore_con="${requirements_pc_ecore_con} ${platform_pc}" 1932EFL_PLATFORM_DEPEND([ECORE_CON], [all])
1975 1933EFL_CRYPTO_DEPEND([ECORE_CON])
1976# Eina, Eo, Eet, Ecore 1934EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eo])
1977 1935EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eet])
1978requirements_pc_ecore_con="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eo >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_con}" 1936EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina])
1979 1937EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore])
1980requirements_pc_ecore_con="${requirements_pc_crypto} ${requirements_pc_ecore_con}"
1981requirements_pc_deps_ecore_con="${requirements_pc_deps_crypto} ${requirements_pc_deps_ecore_con}"
1982requirements_libs_ecore_con="${requirements_libs_crypto} ${requirements_libs_ecore_con}"
1983
1984# cURL
1985EFL_OPTIONAL_DEPEND_PKG([ecore_con], [${want_curl}], [CURL], [libcurl])
1986 1938
1987# c-ares 1939EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_curl}], [CURL], [libcurl])
1988 1940
1989EFL_OPTIONAL_DEPEND_PKG([ecore_con], [${want_cares}], 1941EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_cares}],
1990 [CARES], [libcares >= 1.6.1]) 1942 [CARES], [libcares >= 1.6.1])
1991AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) 1943AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
1992 1944
1993if test "x${requirements_pc_deps_ecore_con}" != "x" ; then 1945EFL_EVAL_PKGS([ECORE_CON])
1994 PKG_CHECK_MODULES([ECORE_CON], [${requirements_pc_deps_ecore_con}])
1995fi
1996
1997requirements_libs_ecore_con="${requirements_libs_ecore_con} ${platform_libs}"
1998
1999ECORE_CON_CFLAGS="${ECORE_CON_CFLAGS} ${LIBGCRYPT_CFLAGS}"
2000ECORE_CON_LIBS="${ECORE_CON_LIBS} ${LIBGCRYPT_LIBS}"
2001requirements_libs_ecore_con="${requirements_libs_ecore_con} ${LIBGCRYPT_LIBS}"
2002 1946
2003### Checks for header files 1947### Checks for header files
2004 1948
@@ -2084,10 +2028,9 @@ EFL_LIB_START([Ecore_Ipc])
2084### Checks for programs 2028### Checks for programs
2085 2029
2086### Checks for libraries 2030### Checks for libraries
2087 2031EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
2088# Eina, Ecore, Ecore_Con 2032EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore])
2089 2033EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina])
2090requirements_pc_ecore_ipc="ecore-con >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_ipc}"
2091 2034
2092### Checks for header files 2035### Checks for header files
2093 2036
@@ -2118,9 +2061,10 @@ EFL_LIB_START([Ecore_File])
2118### Checks for programs 2061### Checks for programs
2119 2062
2120### Checks for libraries 2063### Checks for libraries
2121 2064EFL_PLATFORM_DEPEND([ECORE_FILE], [escape])
2122# Eina, Ecore, Ecore_Con, Escape 2065EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con])
2123requirements_pc_ecore_file="ecore-con >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_file} ${platform_pc_escape}" 2066EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore])
2067EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eina])
2124 2068
2125### Checks for header files 2069### Checks for header files
2126 2070
@@ -2139,7 +2083,6 @@ EFL_LIB_END([Ecore_File])
2139 2083
2140 2084
2141#### Ecore_Input 2085#### Ecore_Input
2142
2143EFL_LIB_START([Ecore_Input]) 2086EFL_LIB_START([Ecore_Input])
2144 2087
2145### Additional options to configure 2088### Additional options to configure
@@ -2149,14 +2092,39 @@ EFL_LIB_START([Ecore_Input])
2149### Checks for programs 2092### Checks for programs
2150 2093
2151### Checks for libraries 2094### Checks for libraries
2095EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore])
2096EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina])
2097
2098### Checks for header files
2099
2100### Checks for types
2101
2102### Checks for structures
2103
2104### Checks for compiler characteristics
2152 2105
2153## Eina, Ecore (ecore_input) 2106### Checks for linker characteristics
2107
2108### Checks for library functions
2109
2110EFL_LIB_END([Ecore_Input])
2111#### End of Ecore_Input
2154 2112
2155requirements_pc_ecore_input="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_input}"
2156 2113
2157## Eina, Evas, Ecore, Ecore_Input (ecore_input_evas) 2114#### Ecore_Input_Evas
2115EFL_LIB_START([Ecore_Input_Evas])
2158 2116
2159requirements_pc_ecore_input_evas="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_input_evas}" 2117### Additional options to configure
2118
2119### Default values
2120
2121### Checks for programs
2122
2123### Checks for libraries
2124EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
2125EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore])
2126EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas])
2127EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
2160 2128
2161### Checks for header files 2129### Checks for header files
2162 2130
@@ -2170,8 +2138,8 @@ requirements_pc_ecore_input_evas="ecore-input >= ${PACKAGE_VERSION} ecore >= ${P
2170 2138
2171### Checks for library functions 2139### Checks for library functions
2172 2140
2173EFL_LIB_END([Ecore_Input]) 2141EFL_LIB_END([Ecore_Input_Evas])
2174#### End of Ecore_Input 2142#### End of Ecore_Input_Evas
2175 2143
2176 2144
2177#### Ecore_Cocoa 2145#### Ecore_Cocoa
@@ -2188,10 +2156,9 @@ have_ecore_cocoa="no"
2188### Checks for programs 2156### Checks for programs
2189 2157
2190### Checks for libraries 2158### Checks for libraries
2191 2159EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore-input])
2192## Eina, Ecore, Ecore_Input 2160EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore])
2193 2161EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eina])
2194requirements_pc_ecore_cocoa="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_cocoa}"
2195 2162
2196### Checks for header files 2163### Checks for header files
2197 2164
@@ -2220,8 +2187,7 @@ window = [[NSWindow alloc]
2220 ]])], 2187 ]])],
2221 [ 2188 [
2222 have_ecore_cocoa="yes" 2189 have_ecore_cocoa="yes"
2223 ECORE_COCOA_LIBS="-framework Cocoa" 2190 EFL_ADD_LIBS([ECORE_COCOA], [-framework Cocoa])
2224 requirements_libs_ecore_cocoa="-framework Cocoa"
2225 ], 2191 ],
2226 [have_ecore_cocoa="no"]) 2192 [have_ecore_cocoa="no"])
2227 LIBS="$LIBS_save" 2193 LIBS="$LIBS_save"
@@ -2271,20 +2237,12 @@ AC_ARG_ENABLE([tslib],
2271### Checks for programs 2237### Checks for programs
2272 2238
2273### Checks for libraries 2239### Checks for libraries
2240EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore])
2241EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina])
2274 2242
2275## Eina, Ecore 2243EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib])
2276
2277requirements_pc_ecore_fb="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_fb}"
2278
2279## tslib
2280EFL_OPTIONAL_DEPEND_PKG([ecore_fb], [${want_tslib}], [TSLIB], [tslib])
2281 2244
2282if test "x${requirements_pc_deps_ecore_fb}" = "x" ; then 2245EFL_EVAL_PKGS([ECORE_FB])
2283 ECORE_FB_LIBS=${requirements_libs_ecore_fb}
2284 AC_SUBST([ECORE_FB_LIBS])
2285else
2286 PKG_CHECK_MODULES([ECORE_FB], [${requirements_pc_deps_ecore_fb}])
2287fi
2288 2246
2289### Checks for header files 2247### Checks for header files
2290 2248
@@ -2319,12 +2277,12 @@ EFL_LIB_START_OPTIONAL([Ecore_Psl1ght], [test "${have_ps3}" = "yes"])
2319### Checks for programs 2277### Checks for programs
2320 2278
2321### Checks for libraries 2279### Checks for libraries
2280EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore-input])
2281EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore])
2282EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eina])
2283EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [escape])
2322 2284
2323## Escape, Eina, Ecore, Ecore_Input 2285EFL_ADD_LIBS([ECORE_PSL1GHT], [-lio -lsysutil -lgem -lcamera -lspurs])
2324
2325requirements_pc_ecore_psl1ght="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} escape >= ${PACKAGE_VERSION} ${requirements_pc_ecore_psl1ght}"
2326
2327requirements_libs_ecore_psl1ght="-lio -lsysutil -lgem -lcamera -lspurs"
2328 2286
2329### Checks for header files 2287### Checks for header files
2330 2288
@@ -2352,18 +2310,17 @@ EFL_LIB_START_OPTIONAL([Ecore_SDL], [test "${want_sdl}" = "yes"])
2352### Checks for programs 2310### Checks for programs
2353 2311
2354### Checks for libraries 2312### Checks for libraries
2313EFL_PLATFORM_DEPEND([ECORE_SDL], [all])
2314EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore-input])
2315EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore])
2316EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eina])
2355 2317
2356## Eina, Ecore 2318EFL_DEPEND_PKG([ECORE_SDL], [SDL], [sdl >= 1.2.0])
2357
2358requirements_pc_ecore_sdl="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_sdl} ${platform_pc}"
2359
2360## SDL
2361EFL_DEPEND_PKG([ecore_sdl], [SDL], [sdl >= 1.2.0])
2362 2319
2363PKG_CHECK_EXISTS([sdl >= 1.3.0], 2320PKG_CHECK_EXISTS([sdl >= 1.3.0],
2364 [AC_DEFINE(BUILD_ECORE_EVAS_SDL_130, 1, [Support for SVN SDL])]) 2321 [AC_DEFINE(BUILD_ECORE_EVAS_SDL_130, 1, [Support for SVN SDL])])
2365 2322
2366PKG_CHECK_MODULES([ECORE_SDL], [${requirements_pc_deps_ecore_sdl}]) 2323EFL_EVAL_PKGS([ECORE_SDL])
2367 2324
2368### Checks for header files 2325### Checks for header files
2369 2326
@@ -2391,16 +2348,14 @@ EFL_LIB_START_OPTIONAL([Ecore_Wayland], [test "${want_wayland}" = "yes"])
2391### Checks for programs 2348### Checks for programs
2392 2349
2393### Checks for libraries 2350### Checks for libraries
2351EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input])
2352EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore])
2353EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina])
2394 2354
2395## Eina, Ecore, Ecore_Input 2355EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND],
2396
2397requirements_pc_ecore_wayland="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION}"
2398
2399## Wayland
2400EFL_DEPEND_PKG([ecore_wayland], [WAYLAND],
2401 [wayland-client wayland-cursor xkbcommon]) 2356 [wayland-client wayland-cursor xkbcommon])
2402 2357
2403PKG_CHECK_MODULES([ECORE_WAYLAND], [${requirements_pc_deps_ecore_wayland}]) 2358EFL_EVAL_PKGS([ECORE_WAYLAND])
2404 2359
2405### Checks for header files 2360### Checks for header files
2406 2361
@@ -2461,27 +2416,15 @@ AC_ARG_ENABLE([pulseaudio],
2461### Checks for programs 2416### Checks for programs
2462 2417
2463### Checks for libraries 2418### Checks for libraries
2419EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
2420EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
2421EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina])
2464 2422
2465# Eina, Eo, Eet, Ecore 2423EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_alsa}], [ALSA], [alsa])
2424EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_pulseaudio}], [PULSE], [libpulse])
2425EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile])
2466 2426
2467requirements_pc_ecore_audio="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_audio}" 2427EFL_EVAL_PKGS([ECORE_AUDIO])
2468
2469EFL_OPTIONAL_DEPEND_PKG([ecore_audio], [${want_alsa}], [ALSA], [alsa])
2470EFL_OPTIONAL_DEPEND_PKG([ecore_audio], [${want_pulseaudio}], [PULSE], [libpulse])
2471EFL_OPTIONAL_DEPEND_PKG([ecore_audio], [${want_sndfile}], [SNDFILE], [sndfile])
2472
2473if test "x${requirements_pc_deps_ecore_audio}" = "x" ; then
2474 ECORE_AUDIO_CFLAGS=""
2475 ECORE_AUDIO_LIBS=""
2476 AC_SUBST([ECORE_AUDIO_CFLAGS])
2477 AC_SUBST([ECORE_AUDIO_LIBS])
2478else
2479 PKG_CHECK_MODULES([ECORE_AUDIO], [${requirements_pc_deps_ecore_audio}])
2480fi
2481
2482ECORE_AUDIO_CFLAGS="${ECORE_AUDIO_CFLAGS}"
2483ECORE_AUDIO_LIBS="${ECORE_AUDIO_LIBS}"
2484requirements_libs_ecore_audio="${requirements_libs_ecore_audio}"
2485 2428
2486### Checks for header files 2429### Checks for header files
2487 2430
@@ -2508,13 +2451,12 @@ EFL_LIB_START_OPTIONAL([Ecore_Win32], [test "${have_win32}" = "yes"])
2508### Checks for programs 2451### Checks for programs
2509 2452
2510### Checks for libraries 2453### Checks for libraries
2454EFL_PLATFORM_DEPEND([ECORE_WIN32], [evil])
2455EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore-input])
2456EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore])
2457EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eina])
2511 2458
2512## Evil, Eina, Ecore, Ecore_Input 2459EFL_ADD_LIBS([ECORE_WIN32], [-lole32 -lgdi32])
2513
2514requirements_pc_ecore_win32="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_win32}"
2515
2516ECORE_WIN32_LIBS="-lole32 -lgdi32"
2517requirements_libs_ecore_win32="-lole32 -lgdi32 ${requirements_libs_ecore_win32}"
2518AC_SUBST([ECORE_WIN32_LIBS]) 2460AC_SUBST([ECORE_WIN32_LIBS])
2519 2461
2520### Checks for header files 2462### Checks for header files
@@ -2543,11 +2485,10 @@ EFL_LIB_START_OPTIONAL([Ecore_WinCE], [test "${have_wince}" = "yes"])
2543### Checks for programs 2485### Checks for programs
2544 2486
2545### Checks for libraries 2487### Checks for libraries
2546 2488EFL_PLATFORM_DEPEND([ECORE_WINCE], [evil])
2547## Evil, Eina, Ecore, Ecore_Input 2489EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore-input])
2548 2490EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore])
2549requirements_pc_ecore_wince="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_wince}" 2491EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [eina])
2550
2551 2492
2552### Checks for header files 2493### Checks for header files
2553 2494
@@ -2619,10 +2560,9 @@ AC_ARG_ENABLE([xim],
2619### Checks for programs 2560### Checks for programs
2620 2561
2621### Checks for libraries 2562### Checks for libraries
2622 2563EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore-input])
2623## Eina, Ecore, Ecore_Input 2564EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore])
2624 2565EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eina])
2625requirements_pc_ecore_x="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_x}"
2626 2566
2627## Xlib 2567## Xlib
2628if test "x${want_x11_xlib}" = "xyes" ; then 2568if test "x${want_x11_xlib}" = "xyes" ; then
@@ -2724,8 +2664,8 @@ if test "x${want_x11_xlib}" = "xyes"; then
2724 ], 2664 ],
2725 [use_Xcursor="no"], 2665 [use_Xcursor="no"],
2726 [$x_libs -lXrender]) 2666 [$x_libs -lXrender])
2727 ECORE_X_CFLAGS="${ECORE_X_CFLAGS} $x_cflags $x_includes" 2667 EFL_ADD_LIBS([ECORE_X], [${Xcursor_libs}])
2728 ECORE_X_LIBS="${ECORE_X_LIBS} ${Xcursor_libs}" 2668 EFL_ADD_CFLAGS([ECORE_X], [$x_cflags $x_includes])
2729fi 2669fi
2730 2670
2731if test "x${want_x11_xlib}" = "xyes" ; then 2671if test "x${want_x11_xlib}" = "xyes" ; then
@@ -2759,7 +2699,7 @@ fi
2759 2699
2760if test "${want_x11_xcb}" = "yes"; then 2700if test "${want_x11_xcb}" = "yes"; then
2761dnl note: added pixman-1 as ecore_xcb_region uses that 2701dnl note: added pixman-1 as ecore_xcb_region uses that
2762 EFL_DEPEND_PKG([ecore_x], [ECORE_X_XCB], 2702 EFL_DEPEND_PKG([ECORE_X], [ECORE_X_XCB],
2763 [x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8 xcb-composite xcb-damage xcb-dpms xcb-randr xcb-render xcb-screensaver xcb-shape xcb-sync xcb-xfixes xcb-xinerama xcb-xprint xcb-xtest xcb-renderutil pixman-1]) 2703 [x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8 xcb-composite xcb-damage xcb-dpms xcb-randr xcb-render xcb-screensaver xcb-shape xcb-sync xcb-xfixes xcb-xinerama xcb-xprint xcb-xtest xcb-renderutil pixman-1])
2764 2704
2765dnl TODO: remove these ifdefs from code! 2705dnl TODO: remove these ifdefs from code!
@@ -2777,7 +2717,7 @@ dnl TODO: remove these ifdefs from code!
2777 AC_DEFINE([ECORE_XCB_XTEST], [1], [Build support for XCB xtest]) 2717 AC_DEFINE([ECORE_XCB_XTEST], [1], [Build support for XCB xtest])
2778 AC_DEFINE([ECORE_XCB_CURSOR], [1], [Build support for XCB cursor]) 2718 AC_DEFINE([ECORE_XCB_CURSOR], [1], [Build support for XCB cursor])
2779 2719
2780 EFL_OPTIONAL_DEPEND_PKG([ecore_x], [${want_gesture}], [ECORE_XCB_GESTURE], 2720 EFL_OPTIONAL_DEPEND_PKG([ECORE_X], [${want_gesture}], [ECORE_XCB_GESTURE],
2781 [xcb-gesture]) 2721 [xcb-gesture])
2782 AC_DEFINE_IF([ECORE_XCB_XGESTURE], [test "${want_gesture}" = "yes"], 2722 AC_DEFINE_IF([ECORE_XCB_XGESTURE], [test "${want_gesture}" = "yes"],
2783 [1], [Build support for XCB xgesture]) 2723 [1], [Build support for XCB xgesture])
@@ -2790,17 +2730,15 @@ dnl dri extension disabled currently in xcb
2790dnl remember to add xcb-dri2 to EFL_DEPEND_PKG() 2730dnl remember to add xcb-dri2 to EFL_DEPEND_PKG()
2791dnl AC_DEFINE([ECORE_XCB_DRI], [1], [Build support for XCB dri]) 2731dnl AC_DEFINE([ECORE_XCB_DRI], [1], [Build support for XCB dri])
2792 2732
2793 PKG_CHECK_MODULES([ECORE_X], [${requirements_pc_deps_ecore_x}]) 2733 EFL_EVAL_PKGS([ECORE_X])
2794 EFL_CHECK_FUNCS([ECORE_X], [dlopen iconv]) 2734 EFL_CHECK_FUNCS([ECORE_X], [dlopen iconv])
2795 2735
2796 HAVE_ECORE_X_BACKEND="HAVE_ECORE_X_XCB" 2736 HAVE_ECORE_X_BACKEND="HAVE_ECORE_X_XCB"
2797fi 2737fi
2798 2738
2799requirements_libs_ecore_x="${requirements_libs_ecore_x} ${ECORE_X_LIBS}" 2739EFL_ADD_LIBS([ECORE_X], [${ECORE_X_LIBS}])
2800 2740
2801AC_SUBST([HAVE_ECORE_X_BACKEND]) 2741AC_SUBST([HAVE_ECORE_X_BACKEND])
2802AC_SUBST([ECORE_X_CFLAGS])
2803AC_SUBST([ECORE_X_LIBS])
2804 2742
2805EFL_LIB_END_OPTIONAL([Ecore_X]) 2743EFL_LIB_END_OPTIONAL([Ecore_X])
2806 2744
@@ -2837,14 +2775,9 @@ fi
2837### Checks for programs 2775### Checks for programs
2838 2776
2839### Checks for libraries 2777### Checks for libraries
2840 2778EFL_PLATFORM_DEPEND([ECORE_IMF], [escape])
2841## Eina, Ecore, Escape (ecore_imf) 2779EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore])
2842 2780EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eina])
2843requirements_pc_ecore_imf="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_imf} ${platform_pc_escape}"
2844
2845## Eina, Evas, Ecore, Ecore_Imf, Escape (ecore_imf_evas)
2846
2847requirements_pc_ecore_imf_evas="ecore-imf >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_imf_evas} ${platform_pc_escape}"
2848 2781
2849## modules 2782## modules
2850 2783
@@ -2853,14 +2786,12 @@ requirements_pc_ecore_imf_evas="ecore-imf >= ${PACKAGE_VERSION} ecore >= ${PACKA
2853have_ecore_imf_ibus="no" 2786have_ecore_imf_ibus="no"
2854if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then 2787if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then
2855 PKG_CHECK_MODULES([IBUS], 2788 PKG_CHECK_MODULES([IBUS],
2856 [ibus-1.0 >= 1.4], 2789 [ibus-1.0 >= 1.4 glib-2.0],
2857 [ 2790 [
2858 have_ecore_imf_ibus="yes" 2791 have_ecore_imf_ibus="yes"
2859 AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support]) 2792 AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
2860 ], 2793 ],
2861 [have_ecore_imf_ibus="no"]) 2794 [have_ecore_imf_ibus="no"])
2862 IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"
2863 IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}"
2864fi 2795fi
2865 2796
2866AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"]) 2797AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"])
@@ -2905,6 +2836,38 @@ EFL_LIB_END([Ecore_Imf])
2905#### End of Ecore_Imf 2836#### End of Ecore_Imf
2906 2837
2907 2838
2839#### Ecore_Imf_Evas
2840EFL_LIB_START([Ecore_Imf_Evas])
2841
2842### Additional options to configure
2843
2844### Default values
2845
2846### Checks for programs
2847
2848### Checks for libraries
2849EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
2850EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf])
2851EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore])
2852EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas])
2853EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
2854
2855### Checks for header files
2856
2857### Checks for types
2858
2859### Checks for structures
2860
2861### Checks for compiler characteristics
2862
2863### Checks for linker characteristics
2864
2865### Checks for library functions
2866
2867EFL_LIB_END([Ecore_Imf_Evas])
2868#### End of Ecore_Imf_Evas
2869
2870
2908#### Ecore_Evas 2871#### Ecore_Evas
2909EFL_LIB_START([Ecore_Evas]) 2872EFL_LIB_START([Ecore_Evas])
2910 2873
@@ -2928,10 +2891,11 @@ fi
2928### Checks for programs 2891### Checks for programs
2929 2892
2930### Checks for libraries 2893### Checks for libraries
2931 2894EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input-evas])
2932## Eina, Evas, Ecore, Ecore_Input 2895EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input])
2933 2896EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore])
2934requirements_pc_ecore_evas="ecore-input-evas >= ${PACKAGE_VERSION} ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}" 2897EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas])
2898EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina])
2935 2899
2936## modules 2900## modules
2937 2901
@@ -3062,14 +3026,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" || \
3062fi 3026fi
3063AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [test "${build_ecore_evas_x11}" = "yes"]) 3027AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [test "${build_ecore_evas_x11}" = "yes"])
3064 3028
3065if test "x${requirements_pc_deps_ecore_evas}" = "x" ; then 3029EFL_EVAL_PKGS([ECORE_EVAS])
3066 ECORE_EVAS_CFLAGS=""
3067 ECORE_EVAS_LIBS=""
3068 AC_SUBST([ECORE_EVAS_CFLAGS])
3069 AC_SUBST([ECORE_EVAS_LIBS])
3070else
3071 PKG_CHECK_MODULES([ECORE_EVAS], [${requirements_pc_deps_ecore_evas}])
3072fi
3073 3030
3074### Checks for header files 3031### Checks for header files
3075 3032
@@ -3096,12 +3053,11 @@ EFL_LIB_START([Eio])
3096### Checks for programs 3053### Checks for programs
3097 3054
3098### Checks for libraries 3055### Checks for libraries
3056EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
3057EFL_INTERNAL_DEPEND_PKG([EIO], [eet])
3058EFL_INTERNAL_DEPEND_PKG([EIO], [eina])
3099 3059
3100requirements_pc_eio="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_eio}" 3060EFL_ADD_LIBS([EIO], [-lm])
3101
3102requirements_libs_eio="${requirements_libs_eio} -lm"
3103EIO_LIBS=${requirements_libs_eio}
3104AC_SUBST([EIO_LIBS])
3105 3061
3106### Checks for header files 3062### Checks for header files
3107 3063
@@ -3201,14 +3157,12 @@ EFL_LIB_START([EDBus])
3201### Checks for programs 3157### Checks for programs
3202 3158
3203### Checks for libraries 3159### Checks for libraries
3160EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore])
3161EFL_INTERNAL_DEPEND_PKG([EDBUS], [eina])
3204 3162
3205## Eina, Ecore 3163EFL_DEPEND_PKG([EDBUS], [DBUS], [dbus-1])
3206
3207requirements_pc_edbus="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION}"
3208
3209EFL_DEPEND_PKG([edbus], [DBUS], [dbus-1])
3210 3164
3211PKG_CHECK_MODULES([EDBUS], [${requirements_pc_deps_edbus}]) 3165EFL_EVAL_PKGS([EDBUS])
3212 3166
3213### Checks for header files 3167### Checks for header files
3214 3168
@@ -3238,15 +3192,11 @@ AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
3238### Checks for programs 3192### Checks for programs
3239 3193
3240### Checks for libraries 3194### Checks for libraries
3241 3195EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
3242## Eet, Ecore, Ecore_File, EDBus, Eina, Evil 3196EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore])
3243 3197EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file])
3244requirements_pc_efreet="eet >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} ecore-file >= ${PACKAGE_VERSION} edbus2 >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${platform_pc_evil}" 3198EFL_INTERNAL_DEPEND_PKG([EFREET], [edbus2])
3245 3199EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
3246AC_ARG_VAR([EFREET_CFLAGS], [preprocessor flags for Efreet])
3247AC_SUBST([EFREET_CFLAGS])
3248AC_ARG_VAR([EFREET_LIBS], [linker flags for Efreet])
3249AC_SUBST([EFREET_LIBS])
3250 3200
3251### Checks for header files 3201### Checks for header files
3252 3202