diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/configure.ac | 159 |
1 files changed, 115 insertions, 44 deletions
diff --git a/libraries/ecore/configure.ac b/libraries/ecore/configure.ac index 78806c1..21393dd 100644 --- a/libraries/ecore/configure.ac +++ b/libraries/ecore/configure.ac | |||
@@ -2,11 +2,11 @@ | |||
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [1]) | 4 | m4_define([v_min], [1]) |
5 | m4_define([v_mic], [0]) | 5 | m4_define([v_mic], [99]) |
6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) | 6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n' | sed 's/Unversioneddirectory/0/' | tr -d '\n'])) |
7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) | 7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) |
8 | ##-- When released, remove the dnl on the below line | 8 | ##-- When released, remove the dnl on the below line |
9 | m4_undefine([v_rev]) | 9 | dnl m4_undefine([v_rev]) |
10 | ##-- When doing snapshots - change soname. remove dnl on below line | 10 | ##-- When doing snapshots - change soname. remove dnl on below line |
11 | dnl m4_define([relname], [ver-pre-svn-07]) | 11 | dnl m4_define([relname], [ver-pre-svn-07]) |
12 | dnl m4_define([v_rel], [-release relname]) | 12 | dnl m4_define([v_rel], [-release relname]) |
@@ -133,6 +133,7 @@ want_ecore_psl1ght="no" | |||
133 | want_ecore_fb="no" | 133 | want_ecore_fb="no" |
134 | want_ecore_directfb="no" | 134 | want_ecore_directfb="no" |
135 | want_ecore_wince="no" | 135 | want_ecore_wince="no" |
136 | want_ecore_wayland="no" | ||
136 | 137 | ||
137 | # ecore_x options (both xlib and xcb) | 138 | # ecore_x options (both xlib and xcb) |
138 | want_ecore_x_composite="yes" | 139 | want_ecore_x_composite="yes" |
@@ -173,9 +174,12 @@ want_ecore_evas_directfb="no" | |||
173 | want_ecore_evas_fb="no" | 174 | want_ecore_evas_fb="no" |
174 | want_ecore_evas_software_16_wince="no" | 175 | want_ecore_evas_software_16_wince="no" |
175 | want_ecore_evas_ews="yes" | 176 | want_ecore_evas_ews="yes" |
177 | want_ecore_evas_wayland_shm="no" | ||
178 | want_ecore_evas_wayland_egl="no" | ||
176 | 179 | ||
177 | # ecore_imf modules | 180 | # ecore_imf modules |
178 | want_ecore_imf_xim="no" | 181 | want_ecore_imf_xim="no" |
182 | want_ecore_imf_scim="no" | ||
179 | 183 | ||
180 | case "$host_os" in | 184 | case "$host_os" in |
181 | mingw32ce* | cegcc*) | 185 | mingw32ce* | cegcc*) |
@@ -224,6 +228,7 @@ case "$host_os" in | |||
224 | want_ecore_fb="yes" | 228 | want_ecore_fb="yes" |
225 | want_ecore_imf="yes" | 229 | want_ecore_imf="yes" |
226 | want_ecore_x="yes" | 230 | want_ecore_x="yes" |
231 | want_ecore_wayland="yes" | ||
227 | want_ecore_evas_software_x11="yes" | 232 | want_ecore_evas_software_x11="yes" |
228 | want_ecore_evas_opengl_x11="yes" | 233 | want_ecore_evas_opengl_x11="yes" |
229 | want_ecore_evas_software_16_x11="yes" | 234 | want_ecore_evas_software_16_x11="yes" |
@@ -234,7 +239,10 @@ case "$host_os" in | |||
234 | want_ecore_evas_gl_cocoa="no" | 239 | want_ecore_evas_gl_cocoa="no" |
235 | want_ecore_evas_directfb="yes" | 240 | want_ecore_evas_directfb="yes" |
236 | want_ecore_evas_fb="yes" | 241 | want_ecore_evas_fb="yes" |
242 | want_ecore_evas_wayland_shm="yes" | ||
243 | want_ecore_evas_wayland_egl="yes" | ||
237 | want_ecore_imf_xim="yes" | 244 | want_ecore_imf_xim="yes" |
245 | want_ecore_imf_scim="yes" | ||
238 | ;; | 246 | ;; |
239 | esac | 247 | esac |
240 | 248 | ||
@@ -262,6 +270,8 @@ requirements_ecore_x="" | |||
262 | requirements_ecore_win32="" | 270 | requirements_ecore_win32="" |
263 | requirements_ecore_wince="" | 271 | requirements_ecore_wince="" |
264 | requirements_ecore_imf_xim="" | 272 | requirements_ecore_imf_xim="" |
273 | requirements_ecore_imf_scim="" | ||
274 | requirements_ecore_wayland="" | ||
265 | 275 | ||
266 | AC_CHECK_DECL([MAXHOSTNAMELEN],[FOUND_MAXHOSTNAMELEN=yes]) | 276 | AC_CHECK_DECL([MAXHOSTNAMELEN],[FOUND_MAXHOSTNAMELEN=yes]) |
267 | 277 | ||
@@ -418,7 +428,7 @@ AC_SUBST(pkgconfig_requires_private) | |||
418 | have_backtrace="no" | 428 | have_backtrace="no" |
419 | AC_CHECK_FUNCS([backtrace], [have_backtrace="yes"], []) | 429 | AC_CHECK_FUNCS([backtrace], [have_backtrace="yes"], []) |
420 | 430 | ||
421 | want_ecore_timer_dump="yes" | 431 | want_ecore_timer_dump="no" |
422 | 432 | ||
423 | AC_ARG_ENABLE([ecore-timer-dump], | 433 | AC_ARG_ENABLE([ecore-timer-dump], |
424 | [AC_HELP_STRING([--disable-ecore-timer-dump], [disable tracking of timer allocation. @<:@default=enable@:>@])], | 434 | [AC_HELP_STRING([--disable-ecore-timer-dump], [disable tracking of timer allocation. @<:@default=enable@:>@])], |
@@ -543,22 +553,22 @@ PKG_CHECK_MODULES(EINA, [eina >= 1.1.0]) | |||
543 | #FIXME check all the requirements when the eina move will be finished | 553 | #FIXME check all the requirements when the eina move will be finished |
544 | requirements_ecore="eina >= 1.1.0 ${requirements_ecore}" | 554 | requirements_ecore="eina >= 1.1.0 ${requirements_ecore}" |
545 | requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}" | 555 | requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}" |
546 | #requirements_ecore_config="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_config}" | 556 | #requirements_ecore_config="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_config}" |
547 | requirements_ecore_directfb="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_directfb}" | 557 | requirements_ecore_directfb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_directfb}" |
548 | requirements_ecore_evas="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_evas}" | 558 | requirements_ecore_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_evas}" |
549 | requirements_ecore_fb="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_fb}" | 559 | requirements_ecore_fb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_fb}" |
550 | requirements_ecore_file="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_file}" | 560 | requirements_ecore_file="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_file}" |
551 | requirements_ecore_imf="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_imf}" | 561 | requirements_ecore_imf="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf}" |
552 | requirements_ecore_imf_evas="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_imf_evas}" | 562 | requirements_ecore_imf_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf_evas}" |
553 | requirements_ecore_input="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_input}" | 563 | requirements_ecore_input="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input}" |
554 | requirements_ecore_input_evas="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_input_evas}" | 564 | requirements_ecore_input_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input_evas}" |
555 | requirements_ecore_ipc="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_ipc}" | 565 | requirements_ecore_ipc="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_ipc}" |
556 | requirements_ecore_cocoa="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_cocoa}" | 566 | requirements_ecore_cocoa="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_cocoa}" |
557 | requirements_ecore_sdl="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_sdl}" | 567 | requirements_ecore_sdl="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" |
558 | requirements_ecore_psl1ght="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_sdl}" | 568 | requirements_ecore_psl1ght="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" |
559 | requirements_ecore_win32="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_win32}" | 569 | requirements_ecore_win32="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_win32}" |
560 | requirements_ecore_wince="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_wince}" | 570 | requirements_ecore_wince="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_wince}" |
561 | requirements_ecore_x="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_x}" | 571 | requirements_ecore_x="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_x}" |
562 | 572 | ||
563 | 573 | ||
564 | # glib support (main loop integration) | 574 | # glib support (main loop integration) |
@@ -1161,7 +1171,7 @@ AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes) | |||
1161 | 1171 | ||
1162 | # Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas) | 1172 | # Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas) |
1163 | 1173 | ||
1164 | PKG_CHECK_MODULES([EVAS], [evas >= 1.1.0], | 1174 | PKG_CHECK_MODULES([EVAS], [evas >= 1.1.99], |
1165 | [have_evas="yes"], | 1175 | [have_evas="yes"], |
1166 | [have_evas="no"]) | 1176 | [have_evas="no"]) |
1167 | 1177 | ||
@@ -1190,7 +1200,7 @@ esac | |||
1190 | 1200 | ||
1191 | # ecore_con | 1201 | # ecore_con |
1192 | 1202 | ||
1193 | AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h sys/socket.h sys/un.h ws2tcpip.h netdb.h]) | 1203 | AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h net/if.h netinet/in.h sys/socket.h sys/un.h ws2tcpip.h netdb.h]) |
1194 | 1204 | ||
1195 | if test "x${ac_cv_header_netdb_h}" = "xyes" ; then | 1205 | if test "x${ac_cv_header_netdb_h}" = "xyes" ; then |
1196 | have_addrinfo="yes" | 1206 | have_addrinfo="yes" |
@@ -1474,7 +1484,10 @@ AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) | |||
1474 | 1484 | ||
1475 | # ecore_ipc | 1485 | # ecore_ipc |
1476 | ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}], | 1486 | ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}], |
1477 | [requirements_ecore_ipc="ecore-con >= 1.1.0 ${requirements_ecore_ipc}"]) | 1487 | [ |
1488 | requirements_ecore_ipc="ecore-con >= 1.1.99 ${requirements_ecore_ipc}" | ||
1489 | requirements_ecore_evas="ecore-ipc >= 1.1.99 ${requirements_ecore_evas}" | ||
1490 | ]) | ||
1478 | 1491 | ||
1479 | # ecore_file | 1492 | # ecore_file |
1480 | ECORE_CHECK_MODULE([file], [${want_ecore_file}], [File]) | 1493 | ECORE_CHECK_MODULE([file], [${want_ecore_file}], [File]) |
@@ -1488,7 +1501,7 @@ if test "x${have_ecore_file}" = "xyes" ; then | |||
1488 | ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"]) | 1501 | ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"]) |
1489 | 1502 | ||
1490 | if test "x${have_ecore_con}" = "xyes" ; then | 1503 | if test "x${have_ecore_con}" = "xyes" ; then |
1491 | requirements_ecore_file="ecore-con >= 1.1.0 ${requirements_ecore_file}" | 1504 | requirements_ecore_file="ecore-con >= 1.1.99 ${requirements_ecore_file}" |
1492 | else | 1505 | else |
1493 | ECORE_CHECK_CURL([${want_curl}], | 1506 | ECORE_CHECK_CURL([${want_curl}], |
1494 | [ | 1507 | [ |
@@ -1507,7 +1520,7 @@ fi | |||
1507 | #fi | 1520 | #fi |
1508 | 1521 | ||
1509 | #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], | 1522 | #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], |
1510 | # [requirements_ecore_config="ecore-ipc >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 ${requirements_ecore_config}"]) | 1523 | # [requirements_ecore_config="ecore-ipc >= 1.1.99 evas >= 1.1.99 eet >= 1.5.0 ${requirements_ecore_config}"]) |
1511 | 1524 | ||
1512 | AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) | 1525 | AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) |
1513 | 1526 | ||
@@ -1523,12 +1536,12 @@ if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then | |||
1523 | fi | 1536 | fi |
1524 | 1537 | ||
1525 | ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}], | 1538 | ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}], |
1526 | [requirements_ecore_imf_evas="ecore-imf >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_imf_evas}"]) | 1539 | [requirements_ecore_imf_evas="ecore-imf >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_imf_evas}"]) |
1527 | 1540 | ||
1528 | # ecore_input{_evas} | 1541 | # ecore_input{_evas} |
1529 | ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input]) | 1542 | ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input]) |
1530 | ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}], | 1543 | ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}], |
1531 | [requirements_ecore_input_evas="ecore-input >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_input}"]) | 1544 | [requirements_ecore_input_evas="ecore-input >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_input}"]) |
1532 | 1545 | ||
1533 | # ecore_imf_xim | 1546 | # ecore_imf_xim |
1534 | AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false) | 1547 | AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false) |
@@ -1542,7 +1555,23 @@ if test "x${have_ecore_imf}" = "xyes" \ | |||
1542 | fi | 1555 | fi |
1543 | 1556 | ||
1544 | ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}], | 1557 | ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}], |
1545 | [requirements_ecore_imf_xim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_xim}"]) | 1558 | [requirements_ecore_imf_xim="ecore-imf >= 1.1.99 ecore-x >= 1.1.99 ecore-input >= 1.1.99 ${requirements_ecore_imf_xim}"]) |
1559 | |||
1560 | # ecore_imf_scim | ||
1561 | PKG_CHECK_MODULES([SCIM], [scim], [have_scim="yes"], [have_scim="no"]) | ||
1562 | |||
1563 | AM_CONDITIONAL(BUILD_ECORE_IMF_SCIM, false) | ||
1564 | ecore_imf_scim_deps="no" | ||
1565 | echo "have_ecore_x_xlib: ${have_ecore_x_xlib}" | ||
1566 | if test "x${have_ecore_imf}" = "xyes" \ | ||
1567 | -a "x${have_scim}" = "xyes" \ | ||
1568 | -a "x${have_ecore_input}" = "xyes" ; then | ||
1569 | ecore_imf_scim_deps="yes" | ||
1570 | AC_DEFINE(BUILD_ECORE_IMF_SCIM, 1, [Ecore Imf SCIM Support]) | ||
1571 | fi | ||
1572 | |||
1573 | ECORE_CHECK_MODULE([imf-scim], [${want_ecore_imf}], [Imf_SCIM], [${ecore_imf_scim_deps}], | ||
1574 | [requirements_ecore_imf_scim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_scim}"]) | ||
1546 | 1575 | ||
1547 | ## Graphic systems | 1576 | ## Graphic systems |
1548 | 1577 | ||
@@ -1557,7 +1586,7 @@ fi | |||
1557 | ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], | 1586 | ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], |
1558 | [ | 1587 | [ |
1559 | ecore_x_libs="$ecore_x_libs $x_libs" | 1588 | ecore_x_libs="$ecore_x_libs $x_libs" |
1560 | requirements_ecore_x="ecore-input >= 1.1.0 ${requirements_ecore_x}" | 1589 | requirements_ecore_x="ecore-input >= 1.1.99 ${requirements_ecore_x}" |
1561 | ]) | 1590 | ]) |
1562 | 1591 | ||
1563 | # ecore_win32 | 1592 | # ecore_win32 |
@@ -1565,7 +1594,7 @@ ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], | |||
1565 | ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}], | 1594 | ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}], |
1566 | [ | 1595 | [ |
1567 | ecore_win32_libs="-lole32 -lgdi32" | 1596 | ecore_win32_libs="-lole32 -lgdi32" |
1568 | requirements_ecore_win32="ecore-input >= 1.1.0 ${requirements_ecore_win32}" | 1597 | requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}" |
1569 | ]) | 1598 | ]) |
1570 | AC_SUBST(ecore_win32_libs) | 1599 | AC_SUBST(ecore_win32_libs) |
1571 | 1600 | ||
@@ -1577,7 +1606,7 @@ if test "x${have_ecore_input}" = "xyes" -a "x${have_cocoa}" = "xyes" ; then | |||
1577 | fi | 1606 | fi |
1578 | 1607 | ||
1579 | ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}], | 1608 | ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}], |
1580 | [requirements_ecore_cocoa="ecore-input >= 1.1.0 ${requirements_ecore_cocoa}"]) | 1609 | [requirements_ecore_cocoa="ecore-input >= 1.1.99 ${requirements_ecore_cocoa}"]) |
1581 | 1610 | ||
1582 | # ecore_sdl | 1611 | # ecore_sdl |
1583 | 1612 | ||
@@ -1587,10 +1616,10 @@ if test "x${have_sdl}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then | |||
1587 | fi | 1616 | fi |
1588 | 1617 | ||
1589 | ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}], | 1618 | ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}], |
1590 | [requirements_ecore_sdl="ecore-input >= 1.1.0 ${requirements_ecore_sdl}"]) | 1619 | [requirements_ecore_sdl="ecore-input >= 1.1.99 ${requirements_ecore_sdl}"]) |
1591 | 1620 | ||
1592 | ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}], | 1621 | ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}], |
1593 | [requirements_ecore_psl1ght="ecore-input >= 1.1.0 ${requirements_ecore_psl1ght}"]) | 1622 | [requirements_ecore_psl1ght="ecore-input >= 1.1.99 ${requirements_ecore_psl1ght}"]) |
1594 | 1623 | ||
1595 | # ecore_fb | 1624 | # ecore_fb |
1596 | ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb]) | 1625 | ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb]) |
@@ -1612,7 +1641,7 @@ ECORE_CHECK_MODULE([directfb], [${want_ecore_directfb}], [DirectFB], [${have_dir | |||
1612 | # ecore_wince | 1641 | # ecore_wince |
1613 | 1642 | ||
1614 | ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}], | 1643 | ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}], |
1615 | [requirements_ecore_win32="ecore-input >= 1.1.0 ${requirements_ecore_win32}"]) | 1644 | [requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"]) |
1616 | 1645 | ||
1617 | ## Ecore Evas | 1646 | ## Ecore Evas |
1618 | 1647 | ||
@@ -1624,7 +1653,7 @@ if test "x${have_evas}" = "xyes" -a "x${have_ecore_input}" = "xyes" -a "x${have_ | |||
1624 | fi | 1653 | fi |
1625 | 1654 | ||
1626 | ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}], | 1655 | ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}], |
1627 | [requirements_ecore_evas="ecore-input >= 1.1.0 ecore-input-evas >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_evas}"]) | 1656 | [requirements_ecore_evas="ecore-input >= 1.1.99 ecore-input-evas >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_evas}"]) |
1628 | 1657 | ||
1629 | # ecore_evas_buffer | 1658 | # ecore_evas_buffer |
1630 | 1659 | ||
@@ -1714,7 +1743,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \ | |||
1714 | "x$have_ecore_evas_software_16_x11" = "xyes" -o \ | 1743 | "x$have_ecore_evas_software_16_x11" = "xyes" -o \ |
1715 | "x$have_ecore_evas_software_xcb" = "xyes"; then | 1744 | "x$have_ecore_evas_software_xcb" = "xyes"; then |
1716 | AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) | 1745 | AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) |
1717 | requirements_ecore_evas="ecore-x >= 1.1.0 ${requirements_ecore_evas}" | 1746 | requirements_ecore_evas="ecore-x >= 1.1.99 ${requirements_ecore_evas}" |
1718 | fi | 1747 | fi |
1719 | 1748 | ||
1720 | # ecore_evas_win32 | 1749 | # ecore_evas_win32 |
@@ -1750,7 +1779,7 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ | |||
1750 | "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ | 1779 | "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ |
1751 | "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then | 1780 | "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then |
1752 | AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) | 1781 | AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) |
1753 | requirements_ecore_evas="ecore-win32 >= 1.1.0 ${requirements_ecore_evas}" | 1782 | requirements_ecore_evas="ecore-win32 >= 1.1.99 ${requirements_ecore_evas}" |
1754 | fi | 1783 | fi |
1755 | 1784 | ||
1756 | # ecore_evas_software_sdl | 1785 | # ecore_evas_software_sdl |
@@ -1759,7 +1788,7 @@ ECORE_EVAS_CHECK_MODULE([software-sdl], | |||
1759 | [${want_ecore_evas_software_sdl}], | 1788 | [${want_ecore_evas_software_sdl}], |
1760 | [Software SDL], | 1789 | [Software SDL], |
1761 | [${have_ecore_sdl}], | 1790 | [${have_ecore_sdl}], |
1762 | [requirements_ecore_evas="ecore-sdl >= 1.1.0 ${requirements_ecore_evas}"]) | 1791 | [requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"]) |
1763 | 1792 | ||
1764 | # ecore_evas_gl_sdl | 1793 | # ecore_evas_gl_sdl |
1765 | 1794 | ||
@@ -1767,7 +1796,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-sdl], | |||
1767 | [${want_ecore_evas_gl_sdl}], | 1796 | [${want_ecore_evas_gl_sdl}], |
1768 | [OpenGL SDL], | 1797 | [OpenGL SDL], |
1769 | [${have_ecore_sdl}], | 1798 | [${have_ecore_sdl}], |
1770 | [requirements_ecore_evas="ecore-sdl >= 1.1.0 ${requirements_ecore_evas}"]) | 1799 | [requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"]) |
1771 | 1800 | ||
1772 | # ecore_evas_cocoa | 1801 | # ecore_evas_cocoa |
1773 | 1802 | ||
@@ -1775,7 +1804,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-cocoa], | |||
1775 | [${want_ecore_evas_gl_cocoa}], | 1804 | [${want_ecore_evas_gl_cocoa}], |
1776 | [OpenGL Cocoa], | 1805 | [OpenGL Cocoa], |
1777 | [${have_ecore_cocoa}], | 1806 | [${have_ecore_cocoa}], |
1778 | [requirements_ecore_evas="ecore-cocoa >= 1.1.0 ${requirements_ecore_evas}"]) | 1807 | [requirements_ecore_evas="ecore-cocoa >= 1.1.99 ${requirements_ecore_evas}"]) |
1779 | 1808 | ||
1780 | # ecore_evas_directfb | 1809 | # ecore_evas_directfb |
1781 | 1810 | ||
@@ -1783,7 +1812,7 @@ ECORE_EVAS_CHECK_MODULE([directfb], | |||
1783 | [${want_ecore_evas_directfb}], | 1812 | [${want_ecore_evas_directfb}], |
1784 | [DirectFB], | 1813 | [DirectFB], |
1785 | [${have_ecore_directfb}], | 1814 | [${have_ecore_directfb}], |
1786 | [requirements_ecore_evas="ecore-directfb >= 1.1.0 ${requirements_ecore_evas}"]) | 1815 | [requirements_ecore_evas="ecore-directfb >= 1.1.99 ${requirements_ecore_evas}"]) |
1787 | 1816 | ||
1788 | # ecore_evas_fb | 1817 | # ecore_evas_fb |
1789 | 1818 | ||
@@ -1791,7 +1820,7 @@ ECORE_EVAS_CHECK_MODULE([fb], | |||
1791 | [${want_ecore_evas_fb}], | 1820 | [${want_ecore_evas_fb}], |
1792 | [Linux Framebuffer], | 1821 | [Linux Framebuffer], |
1793 | [${have_ecore_fb}], | 1822 | [${have_ecore_fb}], |
1794 | [requirements_ecore_evas="ecore-fb >= 1.1.0 ${requirements_ecore_evas}"]) | 1823 | [requirements_ecore_evas="ecore-fb >= 1.1.99 ${requirements_ecore_evas}"]) |
1795 | 1824 | ||
1796 | # ecore_evas_wince | 1825 | # ecore_evas_wince |
1797 | 1826 | ||
@@ -1799,7 +1828,7 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince], | |||
1799 | [${want_ecore_evas_software_16_wince}], | 1828 | [${want_ecore_evas_software_16_wince}], |
1800 | [16 bpp Software Windows CE], | 1829 | [16 bpp Software Windows CE], |
1801 | [${have_ecore_wince}], | 1830 | [${have_ecore_wince}], |
1802 | [requirements_ecore_evas="ecore-wince >= 1.1.0 ${requirements_ecore_evas}"]) | 1831 | [requirements_ecore_evas="ecore-wince >= 1.1.99 ${requirements_ecore_evas}"]) |
1803 | 1832 | ||
1804 | # ecore_evas_ews | 1833 | # ecore_evas_ews |
1805 | 1834 | ||
@@ -1814,7 +1843,40 @@ ECORE_EVAS_CHECK_MODULE([psl1ght], | |||
1814 | [${want_ecore_evas_psl1ght}], | 1843 | [${want_ecore_evas_psl1ght}], |
1815 | [PSL1GHT], | 1844 | [PSL1GHT], |
1816 | [${have_ecore_psl1ght}], | 1845 | [${have_ecore_psl1ght}], |
1817 | [requirements_ecore_evas="ecore-psl1ght >= 1.1.0 ${requirements_ecore_evas}"]) | 1846 | [requirements_ecore_evas="ecore-psl1ght >= 1.1.99 ${requirements_ecore_evas}"]) |
1847 | |||
1848 | ### WAYLAND | ||
1849 | |||
1850 | ecore_wayland_deps="no" | ||
1851 | have_wayland="no" | ||
1852 | if test "x${want_ecore_wayland}" = "xyes" ; then | ||
1853 | PKG_CHECK_MODULES([WAYLAND], [wayland-client xkbcommon], [have_wayland="yes"], [have_wayland="no"]) | ||
1854 | fi | ||
1855 | if test "x${have_ecore_input}" = "xyes" -a "x${have_wayland}" = "xyes" ; then | ||
1856 | ecore_wayland_deps="yes" | ||
1857 | fi | ||
1858 | |||
1859 | ECORE_CHECK_MODULE([wayland], [${want_ecore_wayland}], [Wayland], [${ecore_wayland_deps}]) | ||
1860 | if test "x${have_ecore_wayland}" = "xyes" ; then | ||
1861 | requirements_ecore_wayland="ecore-input >= 1.1.0 wayland-client xkbcommon ${requirements_ecore_wayland}" | ||
1862 | fi | ||
1863 | |||
1864 | ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], | ||
1865 | [${want_ecore_evas_wayland_shm}], | ||
1866 | [Wayland Shm], | ||
1867 | [${have_ecore_wayland}], | ||
1868 | [requirements_ecore_evas="${requirements_ecore_wayland} ${requirements_ecore_evas}"]) | ||
1869 | |||
1870 | ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl], | ||
1871 | [${want_ecore_evas_wayland_egl}], | ||
1872 | [Wayland Egl], | ||
1873 | [${have_ecore_wayland}], | ||
1874 | [ | ||
1875 | PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wayland_egl="yes"], [have_wayland_egl="no"]) | ||
1876 | if test "x${have_wayland_egl}" = "xyes" ; then | ||
1877 | requirements_ecore_evas="wayland-egl egl ${requirements_ecore_wayland} ${requirements_ecore_evas}" | ||
1878 | fi | ||
1879 | ]) | ||
1818 | 1880 | ||
1819 | ### install and build examples | 1881 | ### install and build examples |
1820 | 1882 | ||
@@ -1842,6 +1904,8 @@ AC_SUBST(requirements_ecore_x) | |||
1842 | AC_SUBST(requirements_ecore_win32) | 1904 | AC_SUBST(requirements_ecore_win32) |
1843 | AC_SUBST(requirements_ecore_wince) | 1905 | AC_SUBST(requirements_ecore_wince) |
1844 | AC_SUBST(requirements_ecore_imf_xim) | 1906 | AC_SUBST(requirements_ecore_imf_xim) |
1907 | AC_SUBST(requirements_ecore_imf_scim) | ||
1908 | AC_SUBST(requirements_ecore_wayland) | ||
1845 | 1909 | ||
1846 | AC_CONFIG_FILES([ | 1910 | AC_CONFIG_FILES([ |
1847 | Makefile | 1911 | Makefile |
@@ -1862,6 +1926,7 @@ ecore-sdl.pc | |||
1862 | ecore-cocoa.pc | 1926 | ecore-cocoa.pc |
1863 | ecore-psl1ght.pc | 1927 | ecore-psl1ght.pc |
1864 | ecore-wince.pc | 1928 | ecore-wince.pc |
1929 | ecore-wayland.pc | ||
1865 | ecore.pc | 1930 | ecore.pc |
1866 | doc/ecore.dox | 1931 | doc/ecore.dox |
1867 | doc/Makefile | 1932 | doc/Makefile |
@@ -1890,11 +1955,13 @@ src/lib/ecore_wince/Makefile | |||
1890 | src/lib/ecore_x/Makefile | 1955 | src/lib/ecore_x/Makefile |
1891 | src/lib/ecore_x/xlib/Makefile | 1956 | src/lib/ecore_x/xlib/Makefile |
1892 | src/lib/ecore_x/xcb/Makefile | 1957 | src/lib/ecore_x/xcb/Makefile |
1958 | src/lib/ecore_wayland/Makefile | ||
1893 | src/examples/Makefile | 1959 | src/examples/Makefile |
1894 | src/tests/Makefile | 1960 | src/tests/Makefile |
1895 | src/modules/Makefile | 1961 | src/modules/Makefile |
1896 | src/modules/immodules/Makefile | 1962 | src/modules/immodules/Makefile |
1897 | src/modules/immodules/xim/Makefile | 1963 | src/modules/immodules/xim/Makefile |
1964 | src/modules/immodules/scim/Makefile | ||
1898 | ecore.spec | 1965 | ecore.spec |
1899 | $po_makefile_in | 1966 | $po_makefile_in |
1900 | ]) | 1967 | ]) |
@@ -1953,6 +2020,7 @@ fi | |||
1953 | #echo " Ecore_Config.................: $have_ecore_config (deprecated)" | 2020 | #echo " Ecore_Config.................: $have_ecore_config (deprecated)" |
1954 | echo " Ecore_IMF....................: $have_ecore_imf" | 2021 | echo " Ecore_IMF....................: $have_ecore_imf" |
1955 | echo " XIM........................: $have_ecore_imf_xim" | 2022 | echo " XIM........................: $have_ecore_imf_xim" |
2023 | echo " SCIM.......................: $have_ecore_imf_scim" | ||
1956 | echo " Ecore_IMF_Evas...............: $have_ecore_imf_evas" | 2024 | echo " Ecore_IMF_Evas...............: $have_ecore_imf_evas" |
1957 | echo " Ecore_Input..................: $have_ecore_input" | 2025 | echo " Ecore_Input..................: $have_ecore_input" |
1958 | echo " Ecore_Input_Evas.............: $have_ecore_input_evas" | 2026 | echo " Ecore_Input_Evas.............: $have_ecore_input_evas" |
@@ -2008,6 +2076,7 @@ fi | |||
2008 | echo " Ecore_DirectFB...............: $have_ecore_directfb" | 2076 | echo " Ecore_DirectFB...............: $have_ecore_directfb" |
2009 | echo " Ecore_WinCE..................: $have_ecore_wince" | 2077 | echo " Ecore_WinCE..................: $have_ecore_wince" |
2010 | echo " Ecore_PSL1GHT................: $have_ecore_psl1ght" | 2078 | echo " Ecore_PSL1GHT................: $have_ecore_psl1ght" |
2079 | echo " Ecore_Wayland................: $have_ecore_wayland" | ||
2011 | 2080 | ||
2012 | echo | 2081 | echo |
2013 | echo " Ecore Evas:" | 2082 | echo " Ecore Evas:" |
@@ -2041,6 +2110,8 @@ if test "x${have_ecore_evas}" = "xyes" ; then | |||
2041 | echo " Software 16bit DirectDraw..: $have_ecore_evas_software_16_ddraw" | 2110 | echo " Software 16bit DirectDraw..: $have_ecore_evas_software_16_ddraw" |
2042 | echo " Software 16bit WinCE.......: $have_ecore_evas_software_16_wince" | 2111 | echo " Software 16bit WinCE.......: $have_ecore_evas_software_16_wince" |
2043 | echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" | 2112 | echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" |
2113 | echo " Wayland Shm................: $have_ecore_evas_wayland_shm" | ||
2114 | echo " Wayland Egl................: $have_ecore_evas_wayland_egl" | ||
2044 | fi | 2115 | fi |
2045 | echo | 2116 | echo |
2046 | echo " Tests................: ${enable_tests}" | 2117 | echo " Tests................: ${enable_tests}" |