diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-18 13:48:14 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-18 13:48:14 +0000 |
commit | db38bdd6de782b880ab03c1c4217823d30d5eae0 (patch) | |
tree | 1df90ff44139e1f1528f8d9af4ad8dc48cfddec1 | |
parent | ac4df627f71e4dfc331ef48027fc48b52227a6f1 (diff) |
cosmetic: simplify and colorize features.
EFL_ADD_FEATURE(PKG, NAME, [VALUE]) will do an amazing work to produce
colored output in a standard way.
if value == yes, it's green and shows "+name"
if value == no, it's red and shows "-name"
else it shows cyan and shows "name=value"
if not provided, will use ${have_name:-${want_name}}
SVN revision: 82976
Diffstat (limited to '')
-rw-r--r-- | configure.ac | 329 | ||||
-rw-r--r-- | m4/ecore_check_module.m4 | 60 | ||||
-rw-r--r-- | m4/efl.m4 | 69 | ||||
-rw-r--r-- | m4/evas_check_engine.m4 | 19 | ||||
-rw-r--r-- | m4/evas_check_loader.m4 | 18 |
5 files changed, 222 insertions, 273 deletions
diff --git a/configure.ac b/configure.ac index efcf86c748..e7149db1a8 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1241,21 +1241,32 @@ if test "x${have_pixman}" = "xyes" ; then | |||
1241 | if test "x${have_pixman_font}" = "xyes" ; then | 1241 | if test "x${have_pixman_font}" = "xyes" ; then |
1242 | AC_DEFINE(PIXMAN_FONT, 1, [Allow pixman to render fonts]) | 1242 | AC_DEFINE(PIXMAN_FONT, 1, [Allow pixman to render fonts]) |
1243 | fi | 1243 | fi |
1244 | EFL_ADD_FEATURE([EVAS_PIXMAN], [font], [${have_pixman_font}]) | ||
1245 | |||
1244 | if test "x${have_pixman_rect}" = "xyes" ; then | 1246 | if test "x${have_pixman_rect}" = "xyes" ; then |
1245 | AC_DEFINE(PIXMAN_RECT, 1, [Allow pixman to render rects]) | 1247 | AC_DEFINE(PIXMAN_RECT, 1, [Allow pixman to render rects]) |
1246 | fi | 1248 | fi |
1249 | EFL_ADD_FEATURE([EVAS_PIXMAN], [rect], [${have_pixman_rect}]) | ||
1250 | |||
1247 | if test "x${have_pixman_line}" = "xyes" ; then | 1251 | if test "x${have_pixman_line}" = "xyes" ; then |
1248 | AC_DEFINE(PIXMAN_LINE, 1, [Allow pixman to render lines]) | 1252 | AC_DEFINE(PIXMAN_LINE, 1, [Allow pixman to render lines]) |
1249 | fi | 1253 | fi |
1254 | EFL_ADD_FEATURE([EVAS_PIXMAN], [line], [${have_pixman_line}]) | ||
1255 | |||
1250 | if test "x${have_pixman_poly}" = "xyes" ; then | 1256 | if test "x${have_pixman_poly}" = "xyes" ; then |
1251 | AC_DEFINE(PIXMAN_POLY, 1, [Allow pixman to render polys]) | 1257 | AC_DEFINE(PIXMAN_POLY, 1, [Allow pixman to render polys]) |
1252 | fi | 1258 | fi |
1259 | EFL_ADD_FEATURE([EVAS_PIXMAN], [poly], [${have_pixman_poly}]) | ||
1260 | |||
1253 | if test "x${have_pixman_image}" = "xyes" ; then | 1261 | if test "x${have_pixman_image}" = "xyes" ; then |
1254 | AC_DEFINE(PIXMAN_IMAGE, 1, [Allow pixman to render images]) | 1262 | AC_DEFINE(PIXMAN_IMAGE, 1, [Allow pixman to render images]) |
1255 | fi | 1263 | fi |
1264 | EFL_ADD_FEATURE([EVAS_PIXMAN], [image], [${have_pixman_image}]) | ||
1265 | |||
1256 | if test "x${have_pixman_image_scale_sample}" = "xyes" ; then | 1266 | if test "x${have_pixman_image_scale_sample}" = "xyes" ; then |
1257 | AC_DEFINE(PIXMAN_IMAGE_SCALE_SAMPLE, 1, [Allow pixman to render image sampled scaling]) | 1267 | AC_DEFINE(PIXMAN_IMAGE_SCALE_SAMPLE, 1, [Allow pixman to render image sampled scaling]) |
1258 | fi | 1268 | fi |
1269 | EFL_ADD_FEATURE([EVAS_PIXMAN], [scale_sample], [${have_pixman_scale_sample}]) | ||
1259 | fi | 1270 | fi |
1260 | 1271 | ||
1261 | ## Engines | 1272 | ## Engines |
@@ -1430,6 +1441,7 @@ fi | |||
1430 | 1441 | ||
1431 | AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [test "x${have_static_evas_engine_gl_common}" = "xyes"]) | 1442 | AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [test "x${have_static_evas_engine_gl_common}" = "xyes"]) |
1432 | 1443 | ||
1444 | |||
1433 | ## Image Loaders | 1445 | ## Image Loaders |
1434 | 1446 | ||
1435 | EVAS_CHECK_IMAGE_LOADER([BMP], [${want_evas_image_loader_bmp}]) | 1447 | EVAS_CHECK_IMAGE_LOADER([BMP], [${want_evas_image_loader_bmp}]) |
@@ -1572,6 +1584,12 @@ case "${build_evas_dither_mask}" in | |||
1572 | AC_MSG_ERROR([Unknown Evas dither mask --with-evas-dither-mask=${build_evas_dither_mask}]) | 1584 | AC_MSG_ERROR([Unknown Evas dither mask --with-evas-dither-mask=${build_evas_dither_mask}]) |
1573 | ;; | 1585 | ;; |
1574 | esac | 1586 | esac |
1587 | EFL_ADD_FEATURE([EVAS], [fontconfig]) | ||
1588 | EFL_ADD_FEATURE([EVAS], [fribidi]) | ||
1589 | EFL_ADD_FEATURE([EVAS], [harfbuzz]) | ||
1590 | EFL_ADD_FEATURE([EVAS], [cserve], [${want_evas_cserve2}]) | ||
1591 | EFL_ADD_FEATURE([EVAS], [tile-rotate]) | ||
1592 | EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}]) | ||
1575 | 1593 | ||
1576 | EFL_LIB_END([Evas]) | 1594 | EFL_LIB_END([Evas]) |
1577 | #### End of Evas | 1595 | #### End of Evas |
@@ -1700,6 +1718,9 @@ if test "x${have_glib}" = "xno"; then | |||
1700 | want_g_main_loop="no" | 1718 | want_g_main_loop="no" |
1701 | fi | 1719 | fi |
1702 | 1720 | ||
1721 | EFL_ADD_FEATURE([ECORE], [glib]) | ||
1722 | EFL_ADD_FEATURE([ECORE], [g-main-loop]) | ||
1723 | |||
1703 | want_glib_integration_always=no | 1724 | want_glib_integration_always=no |
1704 | if test "x${with_glib}" = "xalways" ; then | 1725 | if test "x${with_glib}" = "xalways" ; then |
1705 | want_glib_integration_always="yes" | 1726 | want_glib_integration_always="yes" |
@@ -1845,6 +1866,20 @@ EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_cares}], | |||
1845 | [CARES], [libcares >= 1.6.1]) | 1866 | [CARES], [libcares >= 1.6.1]) |
1846 | AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) | 1867 | AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) |
1847 | 1868 | ||
1869 | if test "x$have_cares" = "xyes" ; then | ||
1870 | ecore_con_resolver="cares" | ||
1871 | elif test "x$have_ipv6" = "xyes" ; then | ||
1872 | ecore_con_resolver="dns.c" | ||
1873 | else | ||
1874 | ecore_con_resolver="fork" | ||
1875 | fi | ||
1876 | |||
1877 | EFL_ADD_FEATURE([ECORE_CON], [curl]) | ||
1878 | EFL_ADD_FEATURE([ECORE_CON], [cares]) | ||
1879 | EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}]) | ||
1880 | EFL_ADD_FEATURE([ECORE_CON], [abstract-sockets], [${want_ecore_con_abstract_sockets}]) | ||
1881 | EFL_ADD_FEATURE([ECORE_CON], [resolver], [${ecore_con_resolver}]) | ||
1882 | |||
1848 | EFL_EVAL_PKGS([ECORE_CON]) | 1883 | EFL_EVAL_PKGS([ECORE_CON]) |
1849 | 1884 | ||
1850 | ### Checks for header files | 1885 | ### Checks for header files |
@@ -2077,6 +2112,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo]) | |||
2077 | EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) | 2112 | EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) |
2078 | 2113 | ||
2079 | EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) | 2114 | EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) |
2115 | EFL_ADD_FEATURE([ECORE_FB], [tslib]) | ||
2080 | 2116 | ||
2081 | EFL_EVAL_PKGS([ECORE_FB]) | 2117 | EFL_EVAL_PKGS([ECORE_FB]) |
2082 | 2118 | ||
@@ -2269,6 +2305,10 @@ EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile]) | |||
2269 | 2305 | ||
2270 | EFL_EVAL_PKGS([ECORE_AUDIO]) | 2306 | EFL_EVAL_PKGS([ECORE_AUDIO]) |
2271 | 2307 | ||
2308 | EFL_ADD_FEATURE([ECORE_AUDIO], [alsa]) | ||
2309 | EFL_ADD_FEATURE([ECORE_AUDIO], [pulseaudio]) | ||
2310 | EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile]) | ||
2311 | |||
2272 | ### Checks for header files | 2312 | ### Checks for header files |
2273 | 2313 | ||
2274 | ### Checks for types | 2314 | ### Checks for types |
@@ -2512,12 +2552,17 @@ if test "x${want_x11_xlib}" = "xyes" ; then | |||
2512 | if test "${want_gesture}" = "yes"; then | 2552 | if test "${want_gesture}" = "yes"; then |
2513 | ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension]) | 2553 | ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension]) |
2514 | fi | 2554 | fi |
2555 | EFL_ADD_FEATURE([ECORE_X], [gesture]) | ||
2556 | |||
2515 | if test "${want_xinput2}" = "yes"; then | 2557 | if test "${want_xinput2}" = "yes"; then |
2516 | ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice]) | 2558 | ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice]) |
2517 | fi | 2559 | fi |
2560 | EFL_ADD_FEATURE([ECORE_X], [xinput2]) | ||
2561 | |||
2518 | if test "${want_xinput22}" = "yes"; then | 2562 | if test "${want_xinput22}" = "yes"; then |
2519 | ECORE_CHECK_X_EXTENSION([Xi2_2], [XInput2.h], [Xi],[XIGrabTouchBegin]) | 2563 | ECORE_CHECK_X_EXTENSION([Xi2_2], [XInput2.h], [Xi],[XIGrabTouchBegin]) |
2520 | fi | 2564 | fi |
2565 | EFL_ADD_FEATURE([ECORE_X], [xinput22]) | ||
2521 | 2566 | ||
2522 | AC_DEFINE([HAVE_ECORE_X_XLIB], [1], [Defined to 1 if Xlib is enabled.]) | 2567 | AC_DEFINE([HAVE_ECORE_X_XLIB], [1], [Defined to 1 if Xlib is enabled.]) |
2523 | HAVE_ECORE_X_BACKEND="HAVE_ECORE_X_XLIB" | 2568 | HAVE_ECORE_X_BACKEND="HAVE_ECORE_X_XLIB" |
@@ -2550,6 +2595,8 @@ dnl TODO: remove these ifdefs from code! | |||
2550 | AC_DEFINE_IF([ECORE_XCB_XGESTURE], [test "${want_gesture}" = "yes"], | 2595 | AC_DEFINE_IF([ECORE_XCB_XGESTURE], [test "${want_gesture}" = "yes"], |
2551 | [1], [Build support for XCB xgesture]) | 2596 | [1], [Build support for XCB xgesture]) |
2552 | 2597 | ||
2598 | EFL_ADD_FEATURE([ECORE_X], [gesture]) | ||
2599 | |||
2553 | dnl input extension disabled currently in xcb as xcb-input has some issues | 2600 | dnl input extension disabled currently in xcb as xcb-input has some issues |
2554 | dnl remember to add xcb-xinput to EFL_DEPEND_PKG() | 2601 | dnl remember to add xcb-xinput to EFL_DEPEND_PKG() |
2555 | dnl AC_DEFINE([ECORE_XCB_XINPUT], [1], [Build support for XCB input]) | 2602 | dnl AC_DEFINE([ECORE_XCB_XINPUT], [1], [Build support for XCB input]) |
@@ -2629,6 +2676,7 @@ if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; th | |||
2629 | fi | 2676 | fi |
2630 | 2677 | ||
2631 | AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"]) | 2678 | AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"]) |
2679 | EFL_ADD_FEATURE([ECORE_IMF], [ibus], [${want_ecore_imf_ibus}]) | ||
2632 | 2680 | ||
2633 | # scim | 2681 | # scim |
2634 | 2682 | ||
@@ -2643,6 +2691,7 @@ if test "x${want_ecore_imf_scim}" = "xyes" ; then | |||
2643 | fi | 2691 | fi |
2644 | 2692 | ||
2645 | AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [test "x${have_ecore_imf_scim}" = "xyes"]) | 2693 | AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [test "x${have_ecore_imf_scim}" = "xyes"]) |
2694 | EFL_ADD_FEATURE([ECORE_IMF], [scim], [${want_ecore_imf_scim}]) | ||
2646 | 2695 | ||
2647 | # xim | 2696 | # xim |
2648 | 2697 | ||
@@ -2659,6 +2708,7 @@ if test "x${want_xim}" = "xyes" && test "x${want_ecore_imf_xim}" = "xyes" ; then | |||
2659 | fi | 2708 | fi |
2660 | 2709 | ||
2661 | AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"]) | 2710 | AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"]) |
2711 | EFL_ADD_FEATURE([ECORE_IMF], [xim]) | ||
2662 | 2712 | ||
2663 | ### Checks for header files | 2713 | ### Checks for header files |
2664 | 2714 | ||
@@ -2716,8 +2766,6 @@ EFL_LIB_START([Ecore_Evas]) | |||
2716 | 2766 | ||
2717 | ### Default values | 2767 | ### Default values |
2718 | 2768 | ||
2719 | have_ecore_evas="yes" | ||
2720 | |||
2721 | want_ecore_evas_software_gdi="${have_evas_engine_software_gdi}" | 2769 | want_ecore_evas_software_gdi="${have_evas_engine_software_gdi}" |
2722 | want_ecore_evas_software_ddraw="${have_evas_engine_software_ddraw}" | 2770 | want_ecore_evas_software_ddraw="${have_evas_engine_software_ddraw}" |
2723 | want_ecore_evas_gl_cocoa="${have_evas_engine_gl_cocoa}" | 2771 | want_ecore_evas_gl_cocoa="${have_evas_engine_gl_cocoa}" |
@@ -3015,6 +3063,7 @@ EFL_DEPEND_PKG([EEZE], [EEZE_MOUNT], [mount >= 2.20.0]) | |||
3015 | if test "${want_tizen}" = "yes"; then | 3063 | if test "${want_tizen}" = "yes"; then |
3016 | PKG_CHECK_MODULES([TIZEN_SENSOR], [capi-system-sensor]) | 3064 | PKG_CHECK_MODULES([TIZEN_SENSOR], [capi-system-sensor]) |
3017 | fi | 3065 | fi |
3066 | EFL_ADD_FEATURE([EEZE], [tizen]) | ||
3018 | 3067 | ||
3019 | EFL_EVAL_PKGS([EEZE]) | 3068 | EFL_EVAL_PKGS([EEZE]) |
3020 | 3069 | ||
@@ -3135,6 +3184,9 @@ EFL_INTERNAL_DEPEND_PKG([EDJE], [eio]) | |||
3135 | EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_physics}], [ephysics]) | 3184 | EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_physics}], [ephysics]) |
3136 | #EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio]) | 3185 | #EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio]) |
3137 | 3186 | ||
3187 | EFL_ADD_FEATURE([EDJE], [physics]) | ||
3188 | EFL_ADD_FEATURE([EDJE], [multisense]) | ||
3189 | |||
3138 | EFL_CHECK_LUA_5_1([EDJE]) | 3190 | EFL_CHECK_LUA_5_1([EDJE]) |
3139 | EFL_ADD_LIBS([EDJE], [-lm]) | 3191 | EFL_ADD_LIBS([EDJE], [-lm]) |
3140 | 3192 | ||
@@ -3213,6 +3265,7 @@ EFL_INTERNAL_DEPEND_PKG([EMOTION], [evas]) | |||
3213 | EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio]) | 3265 | EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio]) |
3214 | 3266 | ||
3215 | EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${want_v4l2}], [eeze]) | 3267 | EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${want_v4l2}], [eeze]) |
3268 | EFL_ADD_FEATURE([EMOTION], [v4l2]) | ||
3216 | AM_CONDITIONAL([EMOTION_HAVE_V4L2], [test "${want_v4l2}" = "yes"]) | 3269 | AM_CONDITIONAL([EMOTION_HAVE_V4L2], [test "${want_v4l2}" = "yes"]) |
3217 | 3270 | ||
3218 | ## modules | 3271 | ## modules |
@@ -3223,6 +3276,10 @@ EMOTION_MODULE([xine], [${want_xine}]) | |||
3223 | EMOTION_MODULE([gstreamer], [${want_gstreamer}]) | 3276 | EMOTION_MODULE([gstreamer], [${want_gstreamer}]) |
3224 | EMOTION_MODULE([generic], [${want_emotion_generic}]) | 3277 | EMOTION_MODULE([generic], [${want_emotion_generic}]) |
3225 | 3278 | ||
3279 | EFL_ADD_FEATURE([EMOTION], [xine]) | ||
3280 | EFL_ADD_FEATURE([EMOTION], [gstreamer]) | ||
3281 | EFL_ADD_FEATURE([EMOTION], [generic], [${want_emotion_generic}]) | ||
3282 | |||
3226 | EFL_EVAL_PKGS([EMOTION]) | 3283 | EFL_EVAL_PKGS([EMOTION]) |
3227 | 3284 | ||
3228 | ### Checks for header files | 3285 | ### Checks for header files |
@@ -3421,61 +3478,30 @@ AC_OUTPUT | |||
3421 | 3478 | ||
3422 | #### Info | 3479 | #### Info |
3423 | 3480 | ||
3424 | cpu_summary="$host_cpu (" | ||
3425 | case $host_cpu in | 3481 | case $host_cpu in |
3426 | i*86|x86_64|amd64) | 3482 | i*86|x86_64|amd64) |
3427 | if test "x${build_cpu_mmx}" = "xyes"; then | 3483 | EFL_ADD_FEATURE([cpu], [mmx], [${build_cpu_mmx}]) |
3428 | cpu_summary="${cpu_summary}+mmx" | 3484 | EFL_ADD_FEATURE([cpu], [sse3], [${build_cpu_sse3}]) |
3429 | else | ||
3430 | cpu_summary="${cpu_summary}-mmx" | ||
3431 | fi | ||
3432 | |||
3433 | cpu_summary="${cpu_summary} " | ||
3434 | |||
3435 | if test "x${build_cpu_sse3}" = "xyes"; then | ||
3436 | cpu_summary="${cpu_summary}+sse3" | ||
3437 | else | ||
3438 | cpu_summary="${cpu_summary}-sse3" | ||
3439 | fi | ||
3440 | ;; | 3485 | ;; |
3441 | *power* | *ppc*) | 3486 | *power* | *ppc*) |
3442 | if test "x${build_cpu_altivec}" = "xyes"; then | 3487 | EFL_ADD_FEATURE([cpu], [altivec], [${build_cpu_altivec}]) |
3443 | cpu_summary="${cpu_summary}+altivec" | ||
3444 | else | ||
3445 | cpu_summary="${cpu_summary}-altivec" | ||
3446 | fi | ||
3447 | ;; | 3488 | ;; |
3448 | arm*) | 3489 | arm*) |
3449 | if test "x${build_cpu_neon}" = "xyes"; then | 3490 | EFL_ADD_FEATURE([cpu], [neon], [${build_cpu_neon}]) |
3450 | cpu_summary="${cpu_summary}+neon" | ||
3451 | else | ||
3452 | cpu_summary="${cpu_summary}-neon" | ||
3453 | fi | ||
3454 | ;; | 3491 | ;; |
3455 | esac | 3492 | esac |
3456 | cpu_summary="${cpu_summary})" | ||
3457 | 3493 | ||
3458 | sys_features="" | 3494 | if test "${have_linux}" = "yes"; then |
3459 | if test "x${have_inotify}" = "xyes"; then | 3495 | EFL_ADD_FEATURE([system], [inotify]) |
3460 | sys_features="${sys_features} +inotify" | 3496 | EFL_ADD_FEATURE([system], [atfile_source]) |
3461 | else | 3497 | elif test "${have_windows}" = "yes"; then |
3462 | sys_features="${sys_features} -inotify" | 3498 | EFL_ADD_FEATURE([system], [notify_win32]) |
3463 | fi | ||
3464 | if test "x${have_notify_win32}" = "xyes"; then | ||
3465 | sys_features="${sys_features} +notify_win32" | ||
3466 | else | ||
3467 | sys_features="${sys_features} -notify_win32" | ||
3468 | fi | ||
3469 | if test "x${have_atfile_source}" = "xyes"; then | ||
3470 | sys_features="${sys_features} +atfile" | ||
3471 | else | ||
3472 | sys_features="${sys_features} -atfile" | ||
3473 | fi | ||
3474 | if test "x${have_ipv6}" = "xyes"; then | ||
3475 | sys_features="${sys_features} +ipv6" | ||
3476 | else | ||
3477 | sys_features="${sys_features} -ipv6" | ||
3478 | fi | 3499 | fi |
3500 | EFL_ADD_FEATURE([system], [ipv6]) | ||
3501 | |||
3502 | EFL_ADD_FEATURE([thread], [spinlocks], [${efl_have_posix_threads_spinlock}]) | ||
3503 | EFL_ADD_FEATURE([thread], [barrier], [${efl_have_pthread_barrier}]) | ||
3504 | EFL_ADD_FEATURE([thread], [affinity], [${efl_have_setaffinity}]) | ||
3479 | 3505 | ||
3480 | echo | 3506 | echo |
3481 | echo | 3507 | echo |
@@ -3484,159 +3510,68 @@ echo "------------------------------------------------------------------------" | |||
3484 | echo "$PACKAGE_NAME $PACKAGE_VERSION" | 3510 | echo "$PACKAGE_NAME $PACKAGE_VERSION" |
3485 | echo "------------------------------------------------------------------------" | 3511 | echo "------------------------------------------------------------------------" |
3486 | echo | 3512 | echo |
3487 | echo "Configuration Options Summary:" | ||
3488 | echo | ||
3489 | echo " OS...................: ${host_os}" | ||
3490 | if test "x${have_windows}" = "xyes" ; then | ||
3491 | echo " Windows version......: ${_efl_windows_version}" | ||
3492 | fi | ||
3493 | echo " Build Profile........: ${build_profile}" | ||
3494 | echo " CPU Extensions.......: ${cpu_summary}" | ||
3495 | echo " System Features......:${sys_features}" | ||
3496 | echo " Threads Type.........: ${efl_have_threads}" | ||
3497 | echo " spinlocks..........: ${efl_have_posix_threads_spinlock}" | ||
3498 | echo " barrier............: ${efl_have_pthread_barrier}" | ||
3499 | echo " affinity...........: ${efl_have_setaffinity}" | ||
3500 | echo " Cryptographic System.: ${build_crypto}" | ||
3501 | echo | ||
3502 | 3513 | ||
3503 | echo "Evas:" | 3514 | if test "x${have_windows}" = "xyes" ; then |
3504 | echo | 3515 | osname="${host_os}(${_efl_windows_version})" |
3505 | echo " Engines:" | ||
3506 | echo " Software X11...............: ${with_x11}" | ||
3507 | echo " OpenGL X11.................: ${with_x11} (opengl=${with_opengl})" | ||
3508 | echo " Software GDI...............: $have_evas_engine_software_gdi" | ||
3509 | echo " Software DirectDraw........: $have_evas_engine_software_ddraw" | ||
3510 | echo " OpenGL SDL.................: $have_evas_engine_gl_sdl (opengl=${with_opengl})" | ||
3511 | echo " OpenGL Cocoa...............: $have_evas_engine_gl_cocoa" | ||
3512 | echo " Software Framebuffer.......: $have_evas_engine_fb" | ||
3513 | echo " PSL1GHT....................: $have_ps3" | ||
3514 | echo " Wayland Shm................: $have_evas_engine_wayland_shm" | ||
3515 | echo " Wayland Egl................: $have_evas_engine_wayland_egl" | ||
3516 | echo | ||
3517 | echo " Image Loaders:" | ||
3518 | echo " JPEG region decode......: $have_jpeg_region" | ||
3519 | echo " WEBP....................: $have_evas_image_loader_webp" | ||
3520 | echo " GIF.....................: $have_evas_image_loader_gif" | ||
3521 | echo " TIFF....................: $have_evas_image_loader_tiff" | ||
3522 | echo " SVG.....................: $have_evas_image_loader_svg" | ||
3523 | echo | ||
3524 | echo " Font Searching Systems:" | ||
3525 | echo " Fontconfig..............: $have_fontconfig" | ||
3526 | echo | ||
3527 | echo " Font Rendering Helpers:" | ||
3528 | echo " Fribidi.................: $have_fribidi" | ||
3529 | echo " Harfbuzz................: $have_harfbuzz" | ||
3530 | # FIXME: add non freetype2 font engine support | ||
3531 | # FIXME: make freetype2 optional | ||
3532 | echo | ||
3533 | echo | ||
3534 | echo " Features:" | ||
3535 | echo " Cache Server 2..........: $want_evas_cserve2" | ||
3536 | echo | ||
3537 | echo " Optional pixman rendering path:" | ||
3538 | echo " Pixman..................: $have_pixman" | ||
3539 | echo " Pixman Fonts............: $have_pixman_font" | ||
3540 | echo " Pixman Rects............: $have_pixman_rect" | ||
3541 | echo " Pixman Lines............: $have_pixman_line" | ||
3542 | echo " Pixman Polygons.........: $have_pixman_poly" | ||
3543 | echo " Pixman Images...........: $have_pixman_image" | ||
3544 | echo " Pixman Image ScaleSample: $have_pixman_image_scale_sample" | ||
3545 | echo | ||
3546 | echo " Conversion Options:" | ||
3547 | echo " Dither Mask.............: $build_evas_dither_mask" | ||
3548 | echo " Tiled 32BPP rotate......: $have_tile_rotate" | ||
3549 | echo | ||
3550 | |||
3551 | echo "Ecore:" | ||
3552 | echo " GLib support...............: $with_glib" | ||
3553 | echo " Use g_main_loop............: $want_g_main_loop" | ||
3554 | echo " Gathering memory statistic.: $ac_cv_func_mallinfo" | ||
3555 | echo " Gathering timer allocation.: $want_ecore_timer_dump" | ||
3556 | echo | ||
3557 | |||
3558 | echo "Ecore_Con:" | ||
3559 | echo " CURL.......................: $have_curl" | ||
3560 | echo " Local Sockets..............: $want_ecore_con_local_sockets" | ||
3561 | if test "x$want_ecore_con_local_sockets" = "xyes" ; then | ||
3562 | echo " Abstract Sockets...........: $want_ecore_con_abstract_sockets" | ||
3563 | fi | ||
3564 | if test "x$have_cares" = "xyes" ; then | ||
3565 | echo " Resolver...................: c-ares" | ||
3566 | elif test "x$have_ipv6" = "xyes" ; then | ||
3567 | echo " Resolver...................: dns.c" | ||
3568 | else | 3516 | else |
3569 | echo " Resolver...................: fork" | 3517 | osname="${host_os}" |
3570 | fi | 3518 | fi |
3571 | echo | 3519 | |
3572 | 3520 | echo "Configuration...: ${COLOR_OTHER}profile=${build_profile} os=${osname}${COLOR_RESET}" | |
3573 | echo "Ecore_File:" | 3521 | echo " CPU Extensions: ${host_cpu} (${features_cpu})" |
3574 | echo " CURL.......................: $have_curl" | 3522 | echo " System Feature: ${features_system}" |
3575 | echo | 3523 | echo " Threads.......: ${efl_have_threads} (${features_thread})" |
3576 | 3524 | echo " Cryptography..: ${build_crypto}" | |
3577 | echo "Ecore_IMF....................: $want_ecore_imf" | 3525 | echo " X11...........: ${with_x11}" |
3578 | echo " XIM........................: $have_ecore_imf_xim" | 3526 | echo " OpenGL........: ${with_opengl}" |
3579 | echo " SCIM.......................: $have_ecore_imf_scim" | 3527 | echo "Evas............: yes (${features_evas})" |
3580 | echo " IBUS.......................: $have_ecore_imf_ibus" | 3528 | echo " Engines.......: ${features_evas_engine}" |
3581 | echo | 3529 | echo " Image Loaders.: ${features_evas_loader}" |
3582 | 3530 | if test "x${have_pixman}" = "xyes" ; then | |
3583 | echo "Ecore Graphic systems:" | 3531 | echo " Pixman........: ${features_evas_pixman}" |
3584 | echo | 3532 | fi |
3585 | 3533 | echo "Ecore...........: yes (${features_ecore})" | |
3586 | echo " Ecore_X....................: ${with_x11} (xgesture=${want_gesture}) (xi2=${want_xinput2}) (xi2.2=${want_xinput22})" | 3534 | echo "Ecore_Con.......: yes (${features_ecore_con})" |
3587 | echo " Ecore_Win32................: $have_win32" | 3535 | echo "Ecore_File......: yes" |
3588 | echo " Ecore_Cocoa................: $efl_lib_optional_ecore_cocoa" | 3536 | echo "Ecore_IMF.......: yes (${features_ecore_imf})" |
3589 | echo " Ecore_SDL..................: $want_sdl" | 3537 | echo "Ecore_X.........: ${with_x11} (${features_ecore_x})" |
3590 | echo " Ecore_FB...................: $want_fb (tslib=${have_tslib})" | 3538 | echo "Ecore_SDL.......: $want_sdl" |
3591 | echo " Ecore_WinCE................: $have_wince" | 3539 | echo "Ecore_Wayland...: $want_wayland" |
3592 | echo " Ecore_PSL1GHT..............: $have_ps3" | 3540 | if test "${have_linux}" = "yes"; then |
3593 | echo " Ecore_Wayland..............: $want_wayland" | 3541 | echo "Ecore_FB........: $want_fb (${features_ecore_fb})" |
3594 | if test "${want_audio}" = "yes"; then | 3542 | elif test "${have_ps3}" = "yes"; then |
3595 | echo " Ecore_Audio................: yes (alsa=${have_alsa}, pulseaudio=${have_pulse}, sndfile=${have_sndfile})" | 3543 | echo "Ecore_PSL1GHT...: $have_ps3" |
3544 | elif test "${have_darwin}" = "yes"; then | ||
3545 | echo "Ecore_Cocoa.....: $efl_lib_optional_ecore_cocoa" | ||
3546 | elif test "${have_windows}" = "yes"; then | ||
3547 | echo "Ecore_Win32.....: $have_win32" | ||
3548 | echo "Ecore_WinCE.....: $have_wince" | ||
3549 | fi | ||
3550 | echo "Ecore_Audio.....: ${efl_lib_optional_ecore_audio} (${features_ecore_audio})" | ||
3551 | echo "Ecore_Evas......: yes (${features_ecore_evas})" | ||
3552 | echo "Eeze............: ${efl_lib_optional_eeze} (${features_eeze})" | ||
3553 | echo "EPhysics........: ${efl_lib_optional_ephysics}" | ||
3554 | echo "Edje............: yes (${features_edje})" | ||
3555 | echo "Emotion.........: yes (${features_emotion})" | ||
3556 | echo "Ethumb..........: yes" | ||
3557 | echo "Ethumb_Client...: yes" | ||
3558 | if test "x${build_tests}" = "none"; then | ||
3559 | echo "Tests...........: no" | ||
3596 | else | 3560 | else |
3597 | echo " Ecore_Audio................: no" | 3561 | echo "Tests...........: make check" |
3598 | fi | 3562 | fi |
3599 | 3563 | echo "Tests...........: ${build_tests}" | |
3600 | echo " Ecore_Evas...................: $have_ecore_evas" | 3564 | echo "Examples........: make examples (make install-examples)" |
3601 | #if test "x${have_ecore_evas}" = "xyes" ; then | ||
3602 | echo " Software X11...............: $have_ecore_evas_software_x11" | ||
3603 | echo " OpenGL X11.................: $have_ecore_evas_opengl_x11 (opengl=${with_opengl})" | ||
3604 | echo " Software GDI...............: $have_ecore_evas_software_gdi" | ||
3605 | echo " Software DirectDraw........: $have_ecore_evas_software_ddraw" | ||
3606 | echo " Software SDL...............: $have_ecore_evas_software_sdl" | ||
3607 | echo " OpenGL SDL.................: $have_ecore_evas_opengl_sdl" | ||
3608 | echo " OpenGL Cocoa...............: $have_ecore_evas_opengl_cocoa" | ||
3609 | echo " PSL1GHT....................: $have_ecore_evas_psl1ght" | ||
3610 | echo " Software Framebuffer.......: $have_ecore_evas_fb" | ||
3611 | echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" | ||
3612 | echo " Wayland Shm................: $have_ecore_evas_wayland_shm" | ||
3613 | echo " Wayland Egl................: $have_ecore_evas_wayland_egl" | ||
3614 | echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" | ||
3615 | #fi | ||
3616 | echo | ||
3617 | |||
3618 | echo "Eeze...................: ${efl_lib_optional_eeze} (tizen: ${want_tizen})" | ||
3619 | echo "EPhysics...............: ${efl_lib_optional_ephysics}" | ||
3620 | echo "Edje...................: yes (physics=${efl_lib_optional_ephysics}, multisense=${want_multisense})" | ||
3621 | echo "Emotion................: yes (gstreamer=${have_emotion_module_gstreamer} (xoverlay=${have_gst_xoverlay}), xine=${have_emotion_module_xine}, generic=${have_emotion_module_generic}, v4l2=${want_v4l2})" | ||
3622 | echo "Ethumb.................: yes" | ||
3623 | echo "Ethumb_Client..........: yes" | ||
3624 | echo "Tests..................: ${build_tests}" | ||
3625 | |||
3626 | echo "Examples...............: make examples" | ||
3627 | echo " installation.......: make install-examples" | ||
3628 | if test "x${build_doc}" = "xyes"; then | 3565 | if test "x${build_doc}" = "xyes"; then |
3629 | echo "Documentation..........: make doc" | 3566 | echo "Documentation...: make doc" |
3630 | else | 3567 | else |
3631 | echo "Documentation..........: no" | 3568 | echo "Documentation...: no" |
3632 | fi | 3569 | fi |
3633 | echo | 3570 | echo "Compilation.....: make (or gmake)" |
3634 | echo "Compilation............: make (or gmake)" | 3571 | echo " CPPFLAGS......: $CPPFLAGS" |
3635 | echo " CPPFLAGS.............: $CPPFLAGS" | 3572 | echo " CFLAGS........: $CFLAGS" |
3636 | echo " CFLAGS...............: $CFLAGS" | 3573 | echo " CXXFLAGS......: $CXXFLAGS" |
3637 | echo " CXXFLAGS.............: $CXXFLAGS" | 3574 | echo " LDFLAGS.......: $LDFLAGS" |
3638 | echo " LDFLAGS..............: $LDFLAGS" | 3575 | echo "Installation....: make install (as root if needed, with 'su' or 'sudo')" |
3639 | echo | 3576 | echo " prefix........: $prefix" |
3640 | echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" | ||
3641 | echo " prefix...............: $prefix" | ||
3642 | echo | 3577 | echo |
diff --git a/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4 index 2aa38c3589..784b523e89 100644 --- a/m4/ecore_check_module.m4 +++ b/m4/ecore_check_module.m4 | |||
@@ -1,56 +1,6 @@ | |||
1 | dnl use: ECORE_CHECK_MODULE(Foo, default-enabled, description[, dependency[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) | ||
2 | AC_DEFUN([ECORE_CHECK_MODULE], | ||
3 | [ | ||
4 | m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl | ||
5 | m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl | ||
6 | |||
7 | have_ecore_[]m4_defn([DOWN])=no | ||
8 | ecore_[]m4_defn([DOWN])[]_cflags= | ||
9 | ecore_[]m4_defn([DOWN])[]_libs= | ||
10 | want_module=$2 | ||
11 | |||
12 | AC_ARG_ENABLE(ecore-$1, | ||
13 | [AC_HELP_STRING( | ||
14 | [--enable-ecore-$1], | ||
15 | [enable the ecore_]m4_defn([DOWN])[ module])], | ||
16 | [ | ||
17 | if test "x${enableval}" = "xyes" ; then | ||
18 | want_module="yes" | ||
19 | else | ||
20 | want_module="no" | ||
21 | fi | ||
22 | ], | ||
23 | []) | ||
24 | |||
25 | AC_MSG_CHECKING([whether Ecore_$3 module is to be built]) | ||
26 | |||
27 | if test "x${want_module}" = "xyes" ; then | ||
28 | if test "x$4" = "x" || test "x$4" = "xyes" ; then | ||
29 | AC_DEFINE([BUILD_ECORE_]m4_defn([UP]), [1], [Build Ecore_$3 Module]) | ||
30 | have_ecore_[]m4_defn([DOWN])="yes" | ||
31 | ecore_[]m4_defn([DOWN])[]_libs="-lecore_[]m4_defn([DOWN])" | ||
32 | AC_MSG_RESULT([yes]) | ||
33 | else | ||
34 | AC_MSG_RESULT([no (dependency failed)]) | ||
35 | fi | ||
36 | else | ||
37 | AC_MSG_RESULT([no]) | ||
38 | fi | ||
39 | |||
40 | AM_CONDITIONAL([BUILD_ECORE_]UP, [test "x$have_ecore_]DOWN[" = "xyes"]) | ||
41 | |||
42 | AS_IF([test "x$have_ecore_[]m4_defn([DOWN])" = "xyes"], [$5], [$6]) | ||
43 | |||
44 | AC_SUBST(ecore_[]m4_defn([DOWN])[]_cflags) | ||
45 | AC_SUBST(ecore_[]m4_defn([DOWN])[]_libs) | ||
46 | |||
47 | m4_popdef([UP]) | ||
48 | m4_popdef([DOWN]) | ||
49 | ]) | ||
50 | |||
51 | dnl use: ECORE_EVAS_MODULE(name, want, [DEPENDENCY-CHECK-CODE]) | 1 | dnl use: ECORE_EVAS_MODULE(name, want, [DEPENDENCY-CHECK-CODE]) |
52 | AC_DEFUN([ECORE_EVAS_MODULE], | 2 | AC_DEFUN([ECORE_EVAS_MODULE], |
53 | [ | 3 | [dnl |
54 | m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl | 4 | m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl |
55 | m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl | 5 | m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl |
56 | 6 | ||
@@ -66,8 +16,8 @@ if test "x$have_ecore_evas" = "xyes"; then | |||
66 | fi | 16 | fi |
67 | fi | 17 | fi |
68 | 18 | ||
69 | AM_CONDITIONAL([BUILD_ECORE_EVAS_]UP, [test "x$have_ecore_evas_]m4_defn([DOWN])[" = "xyes"]) | 19 | EFL_ADD_FEATURE([ECORE_EVAS], [$1], [${want_module}])dnl |
70 | 20 | AM_CONDITIONAL([BUILD_ECORE_EVAS_]UP, [test "x$have_ecore_evas_]m4_defn([DOWN])[" = "xyes"])dnl | |
71 | m4_popdef([UP]) | 21 | m4_popdef([UP])dnl |
72 | m4_popdef([DOWN]) | 22 | m4_popdef([DOWN])dnl |
73 | ]) | 23 | ]) |
@@ -33,6 +33,43 @@ m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl | |||
33 | m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl | 33 | m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl |
34 | ]) | 34 | ]) |
35 | 35 | ||
36 | dnl EFL_COLOR | ||
37 | dnl will check if terminal supports color and if color is wanted by user. | ||
38 | dnl | ||
39 | dnl Used Variables: | ||
40 | dnl WANT_COLOR: if no, forces no color output. | ||
41 | dnl TERM: used to check if color should be enabled. | ||
42 | dnl | ||
43 | dnl Defined Variables: | ||
44 | dnl COLOR_YES: to be used in positive/yes conditions | ||
45 | dnl COLOR_NO: to be used in negative/no conditions | ||
46 | dnl COLOR_OTHER: to be used to highlight some other condition | ||
47 | dnl COLOR_RESET: to reset color | ||
48 | dnl want_color: yes or no | ||
49 | AC_DEFUN([EFL_COLOR], | ||
50 | [dnl | ||
51 | case "$TERM" in | ||
52 | xterm|xterm-color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix) | ||
53 | want_color="${WANT_COLOR:-yes}" | ||
54 | ;; | ||
55 | *) | ||
56 | want_color="no" | ||
57 | ;; | ||
58 | esac | ||
59 | |||
60 | if test "${want_color}" = "yes"; then | ||
61 | COLOR_YES=`echo -e "\033@<:@1;32m"` | ||
62 | COLOR_NO=`echo -e "\033@<:@1;31m"` | ||
63 | COLOR_OTHER=`echo -e "\033@<:@1;36m"` | ||
64 | COLOR_RESET=`echo -e "\033@<:@0m"` | ||
65 | else | ||
66 | COLOR_YES="" | ||
67 | COLOR_NO="" | ||
68 | COLOR_OTHER="" | ||
69 | COLOR_RESET="" | ||
70 | fi | ||
71 | ]) | ||
72 | |||
36 | dnl EFL_INIT() | 73 | dnl EFL_INIT() |
37 | dnl Will AC_DEFINE() the following: | 74 | dnl Will AC_DEFINE() the following: |
38 | dnl VMAJ = v_maj | 75 | dnl VMAJ = v_maj |
@@ -51,6 +88,7 @@ dnl lt_rev = libtool 'revision' field of libtool's -version-info | |||
51 | dnl lt_age = libtool 'age' field of libtool's -version-info | 88 | dnl lt_age = libtool 'age' field of libtool's -version-info |
52 | AC_DEFUN([EFL_INIT], | 89 | AC_DEFUN([EFL_INIT], |
53 | [dnl | 90 | [dnl |
91 | AC_REQUIRE([EFL_COLOR])dnl | ||
54 | AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])dnl | 92 | AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])dnl |
55 | AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])dnl | 93 | AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])dnl |
56 | AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])dnl | 94 | AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])dnl |
@@ -378,3 +416,34 @@ AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test "$efl_lib_optional_[]m4_defn([DOWN])" | |||
378 | m4_popdef([UP])dnl | 416 | m4_popdef([UP])dnl |
379 | m4_popdef([DOWN])dnl | 417 | m4_popdef([DOWN])dnl |
380 | ]) | 418 | ]) |
419 | |||
420 | dnl EFL_ADD_FEATURE(PKG, NAME, [VALUE]) | ||
421 | dnl if VALUE is not specified, will use ${have_name} instead. | ||
422 | dnl | ||
423 | dnl Defined Variables: | ||
424 | dnl features_pkg | ||
425 | AC_DEFUN([EFL_ADD_FEATURE], | ||
426 | [dnl | ||
427 | m4_pushdef([DOWNPKG], m4_translit([$1], [-A-Z], [_a-z]))dnl | ||
428 | m4_pushdef([DOWNNAME], m4_translit([$2], [-A-Z], [_a-z]))dnl | ||
429 | |||
430 | value="m4_if($3, , [${have_]m4_defn([DOWNNAME])[:-${want_]m4_defn([DOWNNAME])[}}], [$3])" | ||
431 | case "${value}" in | ||
432 | yes) | ||
433 | tmp="${COLOR_YES}+$2${COLOR_RESET}" | ||
434 | ;; | ||
435 | no) | ||
436 | tmp="${COLOR_NO}-$2${COLOR_RESET}" | ||
437 | ;; | ||
438 | *) | ||
439 | tmp="${COLOR_OTHER}$2=${value}${COLOR_RESET}" | ||
440 | ;; | ||
441 | esac | ||
442 | if test -z "${features_[]m4_defn([DOWNPKG])}"; then | ||
443 | features_[]m4_defn([DOWNPKG])="${tmp}" | ||
444 | else | ||
445 | features_[]m4_defn([DOWNPKG])="${features_[]m4_defn([DOWNPKG])} ${tmp}" | ||
446 | fi | ||
447 | m4_popdef([DOWNNAME])dnl | ||
448 | m4_popdef([DOWNPKG])dnl | ||
449 | ]) | ||
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 index 90d4b528c4..c37e550ac6 100644 --- a/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 | |||
@@ -560,7 +560,7 @@ dnl will call DEPENDENCY-CHECK-CODE if it should be built, | |||
560 | dnl if some dependency fail just call AC_MSG_ERROR() to abort. | 560 | dnl if some dependency fail just call AC_MSG_ERROR() to abort. |
561 | 561 | ||
562 | AC_DEFUN([EVAS_ENGINE], | 562 | AC_DEFUN([EVAS_ENGINE], |
563 | [ | 563 | [dnl |
564 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl | 564 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl |
565 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl | 565 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl |
566 | 566 | ||
@@ -595,16 +595,16 @@ AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "${want_static_engine}" = "yes"]) | |||
595 | AC_SUBST([evas_engine_]m4_defn([DOWN])[_cflags]) | 595 | AC_SUBST([evas_engine_]m4_defn([DOWN])[_cflags]) |
596 | AC_SUBST([evas_engine_]m4_defn([DOWN])[_libs]) | 596 | AC_SUBST([evas_engine_]m4_defn([DOWN])[_libs]) |
597 | 597 | ||
598 | m4_popdef([UP]) | 598 | EFL_ADD_FEATURE([EVAS_ENGINE], [$1], [${have_evas_engine_]DOWN[}])dnl |
599 | m4_popdef([DOWN]) | 599 | m4_popdef([UP])dnl |
600 | m4_popdef([DOWN])dnl | ||
600 | ]) | 601 | ]) |
601 | 602 | ||
602 | 603 | ||
603 | 604 | ||
604 | dnl use: EVAS_CHECK_ENGINE(engine, want_engine, simple, description) | 605 | dnl use: EVAS_CHECK_ENGINE(engine, want_engine, simple, description) |
605 | AC_DEFUN([EVAS_CHECK_ENGINE], | 606 | AC_DEFUN([EVAS_CHECK_ENGINE], |
606 | [ | 607 | [dnl |
607 | |||
608 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl | 608 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl |
609 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl | 609 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl |
610 | 610 | ||
@@ -647,9 +647,8 @@ if test "x${want_static_engine}" = "xyes" ; then | |||
647 | have_static_module="yes" | 647 | have_static_module="yes" |
648 | fi | 648 | fi |
649 | 649 | ||
650 | AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_engine}" = "xyes"]) | 650 | EFL_ADD_FEATURE([EVAS_ENGINE], [$1], [${have_evas_engine_]DOWN[}]) |
651 | 651 | AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_engine}" = "xyes"])dnl | |
652 | m4_popdef([UP]) | 652 | m4_popdef([UP])dnl |
653 | m4_popdef([DOWN]) | 653 | m4_popdef([DOWN])dnl |
654 | |||
655 | ]) | 654 | ]) |
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4 index 54d0eac281..31d64e9695 100644 --- a/m4/evas_check_loader.m4 +++ b/m4/evas_check_loader.m4 | |||
@@ -422,13 +422,10 @@ AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4]) | |||
422 | ]) | 422 | ]) |
423 | 423 | ||
424 | dnl use: EVAS_CHECK_IMAGE_LOADER(loader, want_loader, macro) | 424 | dnl use: EVAS_CHECK_IMAGE_LOADER(loader, want_loader, macro) |
425 | |||
426 | |||
427 | AC_DEFUN([EVAS_CHECK_IMAGE_LOADER], | 425 | AC_DEFUN([EVAS_CHECK_IMAGE_LOADER], |
428 | [ | 426 | [dnl |
429 | 427 | m4_pushdef([UP], m4_toupper([$1]))dnl | |
430 | m4_pushdef([UP], m4_toupper([$1])) | 428 | m4_pushdef([DOWN], m4_tolower([$1]))dnl |
431 | m4_pushdef([DOWN], m4_tolower([$1])) | ||
432 | 429 | ||
433 | want_loader="$2" | 430 | want_loader="$2" |
434 | want_static_loader="no" | 431 | want_static_loader="no" |
@@ -469,9 +466,8 @@ if test "x${want_static_loader}" = "xyes" ; then | |||
469 | have_static_module="yes" | 466 | have_static_module="yes" |
470 | fi | 467 | fi |
471 | 468 | ||
472 | AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"]) | 469 | EFL_ADD_FEATURE([EVAS_LOADER], DOWN, [${have_evas_image_loader_]DOWN[}])dnl |
473 | 470 | AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"])dnl | |
474 | m4_popdef([UP]) | 471 | m4_popdef([UP])dnl |
475 | m4_popdef([DOWN]) | 472 | m4_popdef([DOWN])dnl |
476 | |||
477 | ]) | 473 | ]) |