summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-14 22:36:23 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-14 22:36:23 +0000
commitb1bc5aeb24d6dd0faf97c2d1d6c6781798a7fbe9 (patch)
treeebffce52ddbab71c6da6c2e07eeca7382abf15f6 /configure.ac
parent283805237a9f5f194568667fc32586a3238cbde0 (diff)
efl: simplify automake.
Instead of -I$(top_srcdir)... -I$(top_builddir)... and then do it for the .la, use the EFL_ macros to generate the contents to be used in automake files. There is a nasty bit that libtool will parse Makefile*.am and will not get _DEPENDENCIES from _LIBADD and _LDADD if these are in @REPLACEMENT@. To solve this we must explicitly set _DEPENDENCIES. The contents of this is almost the same as _LIBADD or _LDADD with the "_INTERNAL_" replacement name. I hope the code will be result will be shorter and consistent as there is less places to change when we add/remove dependencies. Statistics are quite impressive (diffstat): {{{ 37 files changed, 663 insertions(+), 1599 deletions(-) }}} SVN revision: 82785
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac104
1 files changed, 40 insertions, 64 deletions
diff --git a/configure.ac b/configure.ac
index f5d9631..fc44ede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,21 +132,6 @@ AC_SUBST(dbusservicedir)
132 132
133#### Default values 133#### Default values
134 134
135platform_pc=""
136platform_pc_evil=""
137platform_pc_escape=""
138platform_pc_exotic=""
139
140platform_libs=""
141platform_libs_evil=""
142platform_libs_escape=""
143platform_libs_exotic=""
144
145platform_cflags=""
146platform_cflags_evil=""
147platform_cflags_escape=""
148platform_cflags_exotic=""
149
150requirements_pc_efl="" 135requirements_pc_efl=""
151requirements_pc_deps_efl="" 136requirements_pc_deps_efl=""
152requirements_libs_efl="" 137requirements_libs_efl=""
@@ -339,10 +324,6 @@ fi
339 324
340AM_CONDITIONAL([EFL_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"]) 325AM_CONDITIONAL([EFL_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"])
341 326
342AC_SUBST([EFL_COV_CFLAGS])
343AC_SUBST([EFL_COV_LIBS])
344
345
346#### Checks for libraries 327#### Checks for libraries
347 328
348# check unit testing library 329# check unit testing library
@@ -561,12 +542,9 @@ AC_DEFINE_IF([HAVE_ATFILE_SOURCE],
561 542
562#### Platform-dependent 543#### Platform-dependent
563DL_LIBS="" 544DL_LIBS=""
545DL_INTERNAL_LIBS=""
564 546
565#### Evil 547#### Evil
566
567USE_EVIL_CFLAGS=""
568USE_EVIL_LIBS=""
569
570EFL_LIB_START_OPTIONAL([Evil], [test "${have_windows}" = "yes"]) 548EFL_LIB_START_OPTIONAL([Evil], [test "${have_windows}" = "yes"])
571 549
572### Default values 550### Default values
@@ -578,16 +556,14 @@ EFL_SELECT_WINDOWS_VERSION
578 556
579### Checks for libraries 557### Checks for libraries
580 558
581EVIL_LIBS=""
582EVIL_DLFCN_LIBS="" 559EVIL_DLFCN_LIBS=""
583if test "${have_wince}" = "xyes"; then 560if test "${have_wince}" = "xyes"; then
584 EVIL_LIBS="-lws2" 561 EFL_ADD_LIBS([EVIL], [-lws2])
585 EVIL_DLFCN_LIBS="-ltoolhelp" 562 EVIL_DLFCN_LIBS="-ltoolhelp"
586else 563else
587 EVIL_LIBS="-lole32 -lws2_32 -lsecur32 -luuid" 564 EFL_ADD_LIBS([EVIL], [-lole32 -lws2_32 -lsecur32 -luuid])
588 EVIL_DLFCN_LIBS="-lpsapi" 565 EVIL_DLFCN_LIBS="-lpsapi"
589fi 566fi
590EFL_ADD_LIBS([EVIL], [${EVIL_LIBS}])
591 567
592AC_SUBST([EVIL_DLFCN_LIBS]) 568AC_SUBST([EVIL_DLFCN_LIBS])
593 569
@@ -599,17 +575,16 @@ AC_SUBST([EVIL_DLFCN_LIBS])
599 575
600### Checks for compiler characteristics 576### Checks for compiler characteristics
601 577
602EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
603EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1" 578EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
604EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wpointer-arith" 579# TODO: should we have these at EFL (global?)
605EVIL_CXXFLAGS="" 580EVIL_CFLAGS="-Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls ${EVIL_CFLAGS}"
581EVIL_CXXFLAGS="${EVIL_CXXFLAGS}"
606 582
607if test "x${have_win32}" = "xyes" ; then 583if test "x${have_win32}" = "xyes" ; then
608 EVIL_CXXFLAGS="-fno-rtti -fno-exceptions" 584 EVIL_CFLAGS="-DSECURITY_WIN32 ${EVIL_CFLAGS}"
609 EVIL_CPPFLAGS="${EVIL_CPPFLAGS} -DSECURITY_WIN32" 585 EVIL_CXXFLAGS="-fno-rtti -fno-exceptions -DSECURITY_WIN32 ${EVIL_CXXFLAGS}"
610fi 586fi
611 587
612AC_SUBST([EVIL_CPPFLAGS])
613AC_SUBST([EVIL_DLFCN_CPPFLAGS]) 588AC_SUBST([EVIL_DLFCN_CPPFLAGS])
614AC_SUBST([EVIL_CXXFLAGS]) 589AC_SUBST([EVIL_CXXFLAGS])
615 590
@@ -617,19 +592,8 @@ AC_SUBST([EVIL_CXXFLAGS])
617 592
618### Checks for library functions 593### Checks for library functions
619 594
620platform_pc_evil="evil >= ${PACKAGE_VERSION}"
621platform_pc="${platform_pc} ${platform_pc_evil}"
622
623if test "x${have_wince}" = "xyes"; then
624 platform_libs_evil="-lws2"
625else
626 platform_libs_evil="-lws2_32"
627fi
628platform_libs="${platform_libs} ${platform_libs_evil}"
629
630USE_EVIL_CFLAGS="-I\$(top_srcdir)/src/lib/evil"
631USE_EVIL_LIBS="lib/evil/libevil.la"
632DL_LIBS="lib/evil/libdl.la" 595DL_LIBS="lib/evil/libdl.la"
596DL_INTERNAL_LIBS="lib/evil/libdl.la"
633 597
634EFL_LIB_END_OPTIONAL([Evil]) 598EFL_LIB_END_OPTIONAL([Evil])
635 599
@@ -639,10 +603,6 @@ AC_SUBST([USE_EVIL_LIBS])
639 603
640 604
641#### Escape 605#### Escape
642
643USE_ESCAPE_CFLAGS=""
644USE_ESCAPE_LIBS=""
645
646EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"]) 606EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"])
647 607
648### Additional options to configure 608### Additional options to configure
@@ -666,19 +626,11 @@ EFL_ADD_LIBS([ESCAPE], [-llv2 -lm -lnet -lsysmodule -liberty])
666 626
667### Checks for library functions 627### Checks for library functions
668 628
669platform_pc_escape="escape >= ${PACKAGE_VERSION}"
670platform_pc="${platform_pc} ${platform_pc_escape}"
671
672USE_ESCAPE_CFLAGS="-I\$(top_srcdir)/src/lib/escape"
673USE_ESCAPE_LIBS="lib/escape/libescape.la"
674
675EFL_LIB_END_OPTIONAL([Escape]) 629EFL_LIB_END_OPTIONAL([Escape])
676
677AC_SUBST([USE_ESCAPE_CFLAGS])
678AC_SUBST([USE_ESCAPE_LIBS])
679#### End of Escape 630#### End of Escape
680 631
681AC_SUBST([DL_LIBS]) 632AC_SUBST([DL_LIBS])
633AC_SUBST([DL_INTERNAL_LIBS])
682#### End of Platform-dependent 634#### End of Platform-dependent
683 635
684 636
@@ -1813,8 +1765,6 @@ AM_CONDITIONAL([HAVE_GSTREAMER], [test "${want_gstreamer}" = "yes"])
1813 1765
1814EFL_EVAL_PKGS([ECORE]) 1766EFL_EVAL_PKGS([ECORE])
1815 1767
1816EFL_ADD_LIBS([ECORE], [${platform_libs}])
1817
1818### Checks for header files 1768### Checks for header files
1819 1769
1820AC_HEADER_SYS_WAIT 1770AC_HEADER_SYS_WAIT
@@ -1995,6 +1945,7 @@ EFL_LIB_START([Ecore_Ipc])
1995### Checks for libraries 1945### Checks for libraries
1996EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con]) 1946EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
1997EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore]) 1947EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore])
1948EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eo])
1998EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina]) 1949EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina])
1999 1950
2000EFL_ADD_LIBS([ECORE_IPC], [-lm]) 1951EFL_ADD_LIBS([ECORE_IPC], [-lm])
@@ -2031,6 +1982,7 @@ EFL_LIB_START([Ecore_File])
2031EFL_PLATFORM_DEPEND([ECORE_FILE], [escape]) 1982EFL_PLATFORM_DEPEND([ECORE_FILE], [escape])
2032EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con]) 1983EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con])
2033EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore]) 1984EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore])
1985EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eo])
2034EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eina]) 1986EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eina])
2035 1987
2036### Checks for header files 1988### Checks for header files
@@ -2060,6 +2012,7 @@ EFL_LIB_START([Ecore_Input])
2060 2012
2061### Checks for libraries 2013### Checks for libraries
2062EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore]) 2014EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore])
2015EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eo])
2063EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina]) 2016EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina])
2064 2017
2065### Checks for header files 2018### Checks for header files
@@ -2091,6 +2044,7 @@ EFL_LIB_START([Ecore_Input_Evas])
2091EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input]) 2044EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
2092EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore]) 2045EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore])
2093EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas]) 2046EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas])
2047EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eo])
2094EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina]) 2048EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
2095 2049
2096### Checks for header files 2050### Checks for header files
@@ -2125,6 +2079,7 @@ have_ecore_cocoa="no"
2125### Checks for libraries 2079### Checks for libraries
2126EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore-input]) 2080EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore-input])
2127EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore]) 2081EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore])
2082EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eo])
2128EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eina]) 2083EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eina])
2129 2084
2130### Checks for header files 2085### Checks for header files
@@ -2205,6 +2160,8 @@ AC_ARG_ENABLE([tslib],
2205 2160
2206### Checks for libraries 2161### Checks for libraries
2207EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore]) 2162EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore])
2163EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore-input])
2164EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo])
2208EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) 2165EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina])
2209 2166
2210EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) 2167EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib])
@@ -2244,10 +2201,12 @@ EFL_LIB_START_OPTIONAL([Ecore_Psl1ght], [test "${have_ps3}" = "yes"])
2244### Checks for programs 2201### Checks for programs
2245 2202
2246### Checks for libraries 2203### Checks for libraries
2204EFL_PLATFORM_DEPEND([ECORE_PSL1GHT], [escape])
2205
2247EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore-input]) 2206EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore-input])
2248EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore]) 2207EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore])
2208EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eo])
2249EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eina]) 2209EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eina])
2250EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [escape])
2251 2210
2252EFL_ADD_LIBS([ECORE_PSL1GHT], [-lio -lsysutil -lgem -lcamera -lspurs]) 2211EFL_ADD_LIBS([ECORE_PSL1GHT], [-lio -lsysutil -lgem -lcamera -lspurs])
2253 2212
@@ -2280,6 +2239,7 @@ EFL_LIB_START_OPTIONAL([Ecore_SDL], [test "${want_sdl}" = "yes"])
2280EFL_PLATFORM_DEPEND([ECORE_SDL], [all]) 2239EFL_PLATFORM_DEPEND([ECORE_SDL], [all])
2281EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore-input]) 2240EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore-input])
2282EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore]) 2241EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore])
2242EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eo])
2283EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eina]) 2243EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eina])
2284 2244
2285EFL_DEPEND_PKG([ECORE_SDL], [SDL], [sdl >= 1.2.0]) 2245EFL_DEPEND_PKG([ECORE_SDL], [SDL], [sdl >= 1.2.0])
@@ -2317,6 +2277,7 @@ EFL_LIB_START_OPTIONAL([Ecore_Wayland], [test "${want_wayland}" = "yes"])
2317### Checks for libraries 2277### Checks for libraries
2318EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input]) 2278EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input])
2319EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore]) 2279EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore])
2280EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eo])
2320EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina]) 2281EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina])
2321 2282
2322EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND], 2283EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND],
@@ -2385,6 +2346,7 @@ AC_ARG_ENABLE([pulseaudio],
2385### Checks for libraries 2346### Checks for libraries
2386EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore]) 2347EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
2387EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet]) 2348EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
2349EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eo])
2388EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina]) 2350EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina])
2389 2351
2390EFL_ADD_LIBS([ECORE_AUDIO], [-lm]) 2352EFL_ADD_LIBS([ECORE_AUDIO], [-lm])
@@ -2423,6 +2385,7 @@ EFL_LIB_START_OPTIONAL([Ecore_Win32], [test "${have_win32}" = "yes"])
2423EFL_PLATFORM_DEPEND([ECORE_WIN32], [evil]) 2385EFL_PLATFORM_DEPEND([ECORE_WIN32], [evil])
2424EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore-input]) 2386EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore-input])
2425EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore]) 2387EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore])
2388EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eo])
2426EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eina]) 2389EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eina])
2427 2390
2428EFL_ADD_LIBS([ECORE_WIN32], [-lole32 -lgdi32]) 2391EFL_ADD_LIBS([ECORE_WIN32], [-lole32 -lgdi32])
@@ -2457,6 +2420,7 @@ EFL_LIB_START_OPTIONAL([Ecore_WinCE], [test "${have_wince}" = "yes"])
2457EFL_PLATFORM_DEPEND([ECORE_WINCE], [evil]) 2420EFL_PLATFORM_DEPEND([ECORE_WINCE], [evil])
2458EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore-input]) 2421EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore-input])
2459EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore]) 2422EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore])
2423EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [eo])
2460EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [eina]) 2424EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [eina])
2461 2425
2462### Checks for header files 2426### Checks for header files
@@ -2531,6 +2495,7 @@ AC_ARG_ENABLE([xim],
2531### Checks for libraries 2495### Checks for libraries
2532EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore-input]) 2496EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore-input])
2533EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore]) 2497EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore])
2498EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eo])
2534EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eina]) 2499EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eina])
2535 2500
2536## Xlib 2501## Xlib
@@ -2728,6 +2693,8 @@ fi
2728### Checks for libraries 2693### Checks for libraries
2729EFL_PLATFORM_DEPEND([ECORE_IMF], [escape]) 2694EFL_PLATFORM_DEPEND([ECORE_IMF], [escape])
2730EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore]) 2695EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore])
2696EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore-input])
2697EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eo])
2731EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eina]) 2698EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eina])
2732 2699
2733if test "x${want_ecore_imf}" = "xyes" ; then 2700if test "x${want_ecore_imf}" = "xyes" ; then
@@ -2811,6 +2778,7 @@ EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
2811EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf]) 2778EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf])
2812EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore]) 2779EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore])
2813EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas]) 2780EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas])
2781EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eo])
2814EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina]) 2782EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
2815 2783
2816### Checks for header files 2784### Checks for header files
@@ -2857,6 +2825,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input-evas])
2857EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input]) 2825EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input])
2858EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore]) 2826EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore])
2859EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas]) 2827EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas])
2828EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo])
2860EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina]) 2829EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina])
2861 2830
2862## modules 2831## modules
@@ -2998,6 +2967,7 @@ EFL_LIB_START([Eio])
2998### Checks for libraries 2967### Checks for libraries
2999EFL_INTERNAL_DEPEND_PKG([EIO], [ecore]) 2968EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
3000EFL_INTERNAL_DEPEND_PKG([EIO], [eet]) 2969EFL_INTERNAL_DEPEND_PKG([EIO], [eet])
2970EFL_INTERNAL_DEPEND_PKG([EIO], [eo])
3001EFL_INTERNAL_DEPEND_PKG([EIO], [eina]) 2971EFL_INTERNAL_DEPEND_PKG([EIO], [eina])
3002 2972
3003EFL_ADD_LIBS([EIO], [-lm]) 2973EFL_ADD_LIBS([EIO], [-lm])
@@ -3031,6 +3001,7 @@ EFL_LIB_START([EDBus])
3031 3001
3032### Checks for libraries 3002### Checks for libraries
3033EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore]) 3003EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore])
3004EFL_INTERNAL_DEPEND_PKG([EDBUS], [eo])
3034EFL_INTERNAL_DEPEND_PKG([EDBUS], [eina]) 3005EFL_INTERNAL_DEPEND_PKG([EDBUS], [eina])
3035 3006
3036EFL_DEPEND_PKG([EDBUS], [DBUS], [dbus-1]) 3007EFL_DEPEND_PKG([EDBUS], [DBUS], [dbus-1])
@@ -3068,7 +3039,8 @@ AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
3068EFL_INTERNAL_DEPEND_PKG([EFREET], [eet]) 3039EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
3069EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore]) 3040EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore])
3070EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file]) 3041EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file])
3071EFL_INTERNAL_DEPEND_PKG([EFREET], [edbus2]) 3042EFL_INTERNAL_DEPEND_PKG([EFREET], [edbus])
3043EFL_INTERNAL_DEPEND_PKG([EFREET], [eo])
3072EFL_INTERNAL_DEPEND_PKG([EFREET], [eina]) 3044EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
3073 3045
3074### Checks for header files 3046### Checks for header files
@@ -3131,6 +3103,7 @@ AC_ARG_WITH([eject],
3131### Checks for libraries 3103### Checks for libraries
3132EFL_INTERNAL_DEPEND_PKG([EEZE], [eina]) 3104EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
3133EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore]) 3105EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
3106EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
3134EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-file]) 3107EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-file])
3135EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-con]) 3108EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-con])
3136EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [eet]) 3109EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [eet])
@@ -3207,6 +3180,7 @@ EFL_PLATFORM_DEPEND([EPHYSICS], [evil])
3207EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina]) 3180EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina])
3208EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas]) 3181EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas])
3209EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore]) 3182EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore])
3183EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eo])
3210 3184
3211EFL_DEPEND_PKG([EPHYSICS], [BULLET], [bullet >= 2.80]) 3185EFL_DEPEND_PKG([EPHYSICS], [BULLET], [bullet >= 2.80])
3212 3186
@@ -3391,6 +3365,7 @@ EFL_PLATFORM_DEPEND([EINA], [evil])
3391 3365
3392EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina]) 3366EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina])
3393EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas]) 3367EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas])
3368EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eo])
3394EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore]) 3369EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore])
3395EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas]) 3370EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas])
3396EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-file]) 3371EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-file])
@@ -3428,6 +3403,7 @@ EFL_LIB_START([Ethumb_Client])
3428 3403
3429### Checks for libraries 3404### Checks for libraries
3430EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina]) 3405EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])
3406EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo])
3431EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore]) 3407EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore])
3432EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edbus]) 3408EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edbus])
3433EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ethumb]) 3409EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ethumb])