forked from enlightenment/efl
update version requirements inside ecore (oh it'll be so much nicer to
have one tree and not do all this fine-grained version requiring!) SVN revision: 66319
This commit is contained in:
parent
885c618f20
commit
ad7b6f9978
|
@ -543,22 +543,22 @@ PKG_CHECK_MODULES(EINA, [eina >= 1.1.0])
|
|||
#FIXME check all the requirements when the eina move will be finished
|
||||
requirements_ecore="eina >= 1.1.0 ${requirements_ecore}"
|
||||
requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}"
|
||||
#requirements_ecore_config="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_config}"
|
||||
requirements_ecore_directfb="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_directfb}"
|
||||
requirements_ecore_evas="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_fb="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_fb}"
|
||||
requirements_ecore_file="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_file}"
|
||||
requirements_ecore_imf="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_imf}"
|
||||
requirements_ecore_imf_evas="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_imf_evas}"
|
||||
requirements_ecore_input="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_input}"
|
||||
requirements_ecore_input_evas="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_input_evas}"
|
||||
requirements_ecore_ipc="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_ipc}"
|
||||
requirements_ecore_cocoa="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_cocoa}"
|
||||
requirements_ecore_sdl="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_sdl}"
|
||||
requirements_ecore_psl1ght="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_sdl}"
|
||||
requirements_ecore_win32="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_win32}"
|
||||
requirements_ecore_wince="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_wince}"
|
||||
requirements_ecore_x="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_x}"
|
||||
#requirements_ecore_config="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_config}"
|
||||
requirements_ecore_directfb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_directfb}"
|
||||
requirements_ecore_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_fb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_fb}"
|
||||
requirements_ecore_file="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_file}"
|
||||
requirements_ecore_imf="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf}"
|
||||
requirements_ecore_imf_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf_evas}"
|
||||
requirements_ecore_input="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input}"
|
||||
requirements_ecore_input_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input_evas}"
|
||||
requirements_ecore_ipc="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_ipc}"
|
||||
requirements_ecore_cocoa="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_cocoa}"
|
||||
requirements_ecore_sdl="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}"
|
||||
requirements_ecore_psl1ght="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}"
|
||||
requirements_ecore_win32="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_win32}"
|
||||
requirements_ecore_wince="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_wince}"
|
||||
requirements_ecore_x="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_x}"
|
||||
|
||||
|
||||
# glib support (main loop integration)
|
||||
|
@ -1161,7 +1161,7 @@ AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes)
|
|||
|
||||
# Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas)
|
||||
|
||||
PKG_CHECK_MODULES([EVAS], [evas >= 1.1.0],
|
||||
PKG_CHECK_MODULES([EVAS], [evas >= 1.1.99],
|
||||
[have_evas="yes"],
|
||||
[have_evas="no"])
|
||||
|
||||
|
@ -1475,8 +1475,8 @@ AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
|
|||
# ecore_ipc
|
||||
ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}],
|
||||
[
|
||||
requirements_ecore_ipc="ecore-con >= 1.1.0 ${requirements_ecore_ipc}"
|
||||
requirements_ecore_evas="ecore-ipc >= 1.1.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_ipc="ecore-con >= 1.1.99 ${requirements_ecore_ipc}"
|
||||
requirements_ecore_evas="ecore-ipc >= 1.1.99 ${requirements_ecore_evas}"
|
||||
])
|
||||
|
||||
# ecore_file
|
||||
|
@ -1491,7 +1491,7 @@ if test "x${have_ecore_file}" = "xyes" ; then
|
|||
ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"])
|
||||
|
||||
if test "x${have_ecore_con}" = "xyes" ; then
|
||||
requirements_ecore_file="ecore-con >= 1.1.0 ${requirements_ecore_file}"
|
||||
requirements_ecore_file="ecore-con >= 1.1.99 ${requirements_ecore_file}"
|
||||
else
|
||||
ECORE_CHECK_CURL([${want_curl}],
|
||||
[
|
||||
|
@ -1510,7 +1510,7 @@ fi
|
|||
#fi
|
||||
|
||||
#ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}],
|
||||
# [requirements_ecore_config="ecore-ipc >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 ${requirements_ecore_config}"])
|
||||
# [requirements_ecore_config="ecore-ipc >= 1.1.99 evas >= 1.1.99 eet >= 1.5.0 ${requirements_ecore_config}"])
|
||||
|
||||
AM_CONDITIONAL(BUILD_ECORE_CONFIG, false)
|
||||
|
||||
|
@ -1526,12 +1526,12 @@ if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then
|
|||
fi
|
||||
|
||||
ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}],
|
||||
[requirements_ecore_imf_evas="ecore-imf >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_imf_evas}"])
|
||||
[requirements_ecore_imf_evas="ecore-imf >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_imf_evas}"])
|
||||
|
||||
# ecore_input{_evas}
|
||||
ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input])
|
||||
ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}],
|
||||
[requirements_ecore_input_evas="ecore-input >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_input}"])
|
||||
[requirements_ecore_input_evas="ecore-input >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_input}"])
|
||||
|
||||
# ecore_imf_xim
|
||||
AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false)
|
||||
|
@ -1545,7 +1545,7 @@ if test "x${have_ecore_imf}" = "xyes" \
|
|||
fi
|
||||
|
||||
ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}],
|
||||
[requirements_ecore_imf_xim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_xim}"])
|
||||
[requirements_ecore_imf_xim="ecore-imf >= 1.1.99 ecore-x >= 1.1.99 ecore-input >= 1.1.99 ${requirements_ecore_imf_xim}"])
|
||||
|
||||
## Graphic systems
|
||||
|
||||
|
@ -1560,7 +1560,7 @@ fi
|
|||
ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}],
|
||||
[
|
||||
ecore_x_libs="$ecore_x_libs $x_libs"
|
||||
requirements_ecore_x="ecore-input >= 1.1.0 ${requirements_ecore_x}"
|
||||
requirements_ecore_x="ecore-input >= 1.1.99 ${requirements_ecore_x}"
|
||||
])
|
||||
|
||||
# ecore_win32
|
||||
|
@ -1568,7 +1568,7 @@ ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}],
|
|||
ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}],
|
||||
[
|
||||
ecore_win32_libs="-lole32 -lgdi32"
|
||||
requirements_ecore_win32="ecore-input >= 1.1.0 ${requirements_ecore_win32}"
|
||||
requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"
|
||||
])
|
||||
AC_SUBST(ecore_win32_libs)
|
||||
|
||||
|
@ -1580,7 +1580,7 @@ if test "x${have_ecore_input}" = "xyes" -a "x${have_cocoa}" = "xyes" ; then
|
|||
fi
|
||||
|
||||
ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}],
|
||||
[requirements_ecore_cocoa="ecore-input >= 1.1.0 ${requirements_ecore_cocoa}"])
|
||||
[requirements_ecore_cocoa="ecore-input >= 1.1.99 ${requirements_ecore_cocoa}"])
|
||||
|
||||
# ecore_sdl
|
||||
|
||||
|
@ -1590,10 +1590,10 @@ if test "x${have_sdl}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then
|
|||
fi
|
||||
|
||||
ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}],
|
||||
[requirements_ecore_sdl="ecore-input >= 1.1.0 ${requirements_ecore_sdl}"])
|
||||
[requirements_ecore_sdl="ecore-input >= 1.1.99 ${requirements_ecore_sdl}"])
|
||||
|
||||
ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}],
|
||||
[requirements_ecore_psl1ght="ecore-input >= 1.1.0 ${requirements_ecore_psl1ght}"])
|
||||
[requirements_ecore_psl1ght="ecore-input >= 1.1.99 ${requirements_ecore_psl1ght}"])
|
||||
|
||||
# ecore_fb
|
||||
ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb])
|
||||
|
@ -1615,7 +1615,7 @@ ECORE_CHECK_MODULE([directfb], [${want_ecore_directfb}], [DirectFB], [${have_dir
|
|||
# ecore_wince
|
||||
|
||||
ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}],
|
||||
[requirements_ecore_win32="ecore-input >= 1.1.0 ${requirements_ecore_win32}"])
|
||||
[requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"])
|
||||
|
||||
## Ecore Evas
|
||||
|
||||
|
@ -1627,7 +1627,7 @@ if test "x${have_evas}" = "xyes" -a "x${have_ecore_input}" = "xyes" -a "x${have_
|
|||
fi
|
||||
|
||||
ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}],
|
||||
[requirements_ecore_evas="ecore-input >= 1.1.0 ecore-input-evas >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-input >= 1.1.99 ecore-input-evas >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_buffer
|
||||
|
||||
|
@ -1717,7 +1717,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \
|
|||
"x$have_ecore_evas_software_16_x11" = "xyes" -o \
|
||||
"x$have_ecore_evas_software_xcb" = "xyes"; then
|
||||
AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas])
|
||||
requirements_ecore_evas="ecore-x >= 1.1.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_evas="ecore-x >= 1.1.99 ${requirements_ecore_evas}"
|
||||
fi
|
||||
|
||||
# ecore_evas_win32
|
||||
|
@ -1753,7 +1753,7 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \
|
|||
"x${have_ecore_evas_opengl_glew}" = "xyes" -o \
|
||||
"x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then
|
||||
AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
|
||||
requirements_ecore_evas="ecore-win32 >= 1.1.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_evas="ecore-win32 >= 1.1.99 ${requirements_ecore_evas}"
|
||||
fi
|
||||
|
||||
# ecore_evas_software_sdl
|
||||
|
@ -1762,7 +1762,7 @@ ECORE_EVAS_CHECK_MODULE([software-sdl],
|
|||
[${want_ecore_evas_software_sdl}],
|
||||
[Software SDL],
|
||||
[${have_ecore_sdl}],
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_gl_sdl
|
||||
|
||||
|
@ -1770,7 +1770,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-sdl],
|
|||
[${want_ecore_evas_gl_sdl}],
|
||||
[OpenGL SDL],
|
||||
[${have_ecore_sdl}],
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_cocoa
|
||||
|
||||
|
@ -1778,7 +1778,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-cocoa],
|
|||
[${want_ecore_evas_gl_cocoa}],
|
||||
[OpenGL Cocoa],
|
||||
[${have_ecore_cocoa}],
|
||||
[requirements_ecore_evas="ecore-cocoa >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-cocoa >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_directfb
|
||||
|
||||
|
@ -1786,7 +1786,7 @@ ECORE_EVAS_CHECK_MODULE([directfb],
|
|||
[${want_ecore_evas_directfb}],
|
||||
[DirectFB],
|
||||
[${have_ecore_directfb}],
|
||||
[requirements_ecore_evas="ecore-directfb >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-directfb >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_fb
|
||||
|
||||
|
@ -1794,7 +1794,7 @@ ECORE_EVAS_CHECK_MODULE([fb],
|
|||
[${want_ecore_evas_fb}],
|
||||
[Linux Framebuffer],
|
||||
[${have_ecore_fb}],
|
||||
[requirements_ecore_evas="ecore-fb >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-fb >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_wince
|
||||
|
||||
|
@ -1802,7 +1802,7 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince],
|
|||
[${want_ecore_evas_software_16_wince}],
|
||||
[16 bpp Software Windows CE],
|
||||
[${have_ecore_wince}],
|
||||
[requirements_ecore_evas="ecore-wince >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-wince >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_ews
|
||||
|
||||
|
@ -1817,7 +1817,7 @@ ECORE_EVAS_CHECK_MODULE([psl1ght],
|
|||
[${want_ecore_evas_psl1ght}],
|
||||
[PSL1GHT],
|
||||
[${have_ecore_psl1ght}],
|
||||
[requirements_ecore_evas="ecore-psl1ght >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-psl1ght >= 1.1.99 ${requirements_ecore_evas}"])
|
||||
|
||||
### install and build examples
|
||||
|
||||
|
|
Loading…
Reference in New Issue