forked from enlightenment/efl
update release candidate trees to their release version in preparation
for alpha SVN revision: 65280
This commit is contained in:
parent
c164909d69
commit
9e655af267
|
|
@ -1,12 +1,12 @@
|
|||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [0])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [1])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##-- When doing snapshots - change soname. remove dnl on below line
|
||||
dnl m4_define([relname], [ver-pre-svn-07])
|
||||
dnl m4_define([v_rel], [-release relname])
|
||||
|
|
@ -539,26 +539,26 @@ AC_SUBST(rt_libs)
|
|||
|
||||
# Eina library
|
||||
|
||||
PKG_CHECK_MODULES(EINA, [eina >= 1.0.0])
|
||||
PKG_CHECK_MODULES(EINA, [eina >= 1.1.0])
|
||||
#FIXME check all the requirements when the eina move will be finished
|
||||
requirements_ecore="eina >= 1.0.0 ${requirements_ecore}"
|
||||
requirements_ecore_con="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_con}"
|
||||
#requirements_ecore_config="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_config}"
|
||||
requirements_ecore_directfb="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_directfb}"
|
||||
requirements_ecore_evas="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_fb="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_fb}"
|
||||
requirements_ecore_file="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_file}"
|
||||
requirements_ecore_imf="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_imf}"
|
||||
requirements_ecore_imf_evas="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_imf_evas}"
|
||||
requirements_ecore_input="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_input}"
|
||||
requirements_ecore_input_evas="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_input_evas}"
|
||||
requirements_ecore_ipc="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_ipc}"
|
||||
requirements_ecore_cocoa="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_cocoa}"
|
||||
requirements_ecore_sdl="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_sdl}"
|
||||
requirements_ecore_psl1ght="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_sdl}"
|
||||
requirements_ecore_win32="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_win32}"
|
||||
requirements_ecore_wince="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_wince}"
|
||||
requirements_ecore_x="ecore >= 1.0.0 eina >= 1.0.0 ${requirements_ecore_x}"
|
||||
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}"
|
||||
|
||||
|
||||
# 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.0.0],
|
||||
PKG_CHECK_MODULES([EVAS], [evas >= 1.1.0],
|
||||
[have_evas="yes"],
|
||||
[have_evas="no"])
|
||||
|
||||
|
|
@ -1474,7 +1474,7 @@ 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.0.0 ${requirements_ecore_ipc}"])
|
||||
[requirements_ecore_ipc="ecore-con >= 1.1.0 ${requirements_ecore_ipc}"])
|
||||
|
||||
# ecore_file
|
||||
ECORE_CHECK_MODULE([file], [${want_ecore_file}], [File])
|
||||
|
|
@ -1488,7 +1488,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.0.0 ${requirements_ecore_file}"
|
||||
requirements_ecore_file="ecore-con >= 1.1.0 ${requirements_ecore_file}"
|
||||
else
|
||||
ECORE_CHECK_CURL([${want_curl}],
|
||||
[
|
||||
|
|
@ -1507,7 +1507,7 @@ fi
|
|||
#fi
|
||||
|
||||
#ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}],
|
||||
# [requirements_ecore_config="ecore-ipc >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 ${requirements_ecore_config}"])
|
||||
# [requirements_ecore_config="ecore-ipc >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 ${requirements_ecore_config}"])
|
||||
|
||||
AM_CONDITIONAL(BUILD_ECORE_CONFIG, false)
|
||||
|
||||
|
|
@ -1523,12 +1523,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.0.0 evas >= 1.0.0 ${requirements_ecore_imf_evas}"])
|
||||
[requirements_ecore_imf_evas="ecore-imf >= 1.1.0 evas >= 1.1.0 ${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.0.0 evas >= 1.0.0 ${requirements_ecore_input}"])
|
||||
[requirements_ecore_input_evas="ecore-input >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_input}"])
|
||||
|
||||
# ecore_imf_xim
|
||||
AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false)
|
||||
|
|
@ -1542,7 +1542,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.0.0 ecore-x >= 1.0.0 ecore-input >= 1.0.0 ${requirements_ecore_imf_xim}"])
|
||||
[requirements_ecore_imf_xim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_xim}"])
|
||||
|
||||
## Graphic systems
|
||||
|
||||
|
|
@ -1557,7 +1557,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.0.0 ${requirements_ecore_x}"
|
||||
requirements_ecore_x="ecore-input >= 1.1.0 ${requirements_ecore_x}"
|
||||
])
|
||||
|
||||
# ecore_win32
|
||||
|
|
@ -1565,7 +1565,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.0.0 ${requirements_ecore_win32}"
|
||||
requirements_ecore_win32="ecore-input >= 1.1.0 ${requirements_ecore_win32}"
|
||||
])
|
||||
AC_SUBST(ecore_win32_libs)
|
||||
|
||||
|
|
@ -1577,7 +1577,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.0.0 ${requirements_ecore_cocoa}"])
|
||||
[requirements_ecore_cocoa="ecore-input >= 1.1.0 ${requirements_ecore_cocoa}"])
|
||||
|
||||
# ecore_sdl
|
||||
|
||||
|
|
@ -1587,10 +1587,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.0.0 ${requirements_ecore_sdl}"])
|
||||
[requirements_ecore_sdl="ecore-input >= 1.1.0 ${requirements_ecore_sdl}"])
|
||||
|
||||
ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}],
|
||||
[requirements_ecore_psl1ght="ecore-input >= 1.0.0 ${requirements_ecore_psl1ght}"])
|
||||
[requirements_ecore_psl1ght="ecore-input >= 1.1.0 ${requirements_ecore_psl1ght}"])
|
||||
|
||||
# ecore_fb
|
||||
ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb])
|
||||
|
|
@ -1612,7 +1612,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.0.0 ${requirements_ecore_win32}"])
|
||||
[requirements_ecore_win32="ecore-input >= 1.1.0 ${requirements_ecore_win32}"])
|
||||
|
||||
## Ecore Evas
|
||||
|
||||
|
|
@ -1624,7 +1624,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.0.0 ecore-input-evas >= 1.0.0 evas >= 1.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-input >= 1.1.0 ecore-input-evas >= 1.1.0 evas >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_buffer
|
||||
|
||||
|
|
@ -1714,7 +1714,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.0.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_evas="ecore-x >= 1.1.0 ${requirements_ecore_evas}"
|
||||
fi
|
||||
|
||||
# ecore_evas_win32
|
||||
|
|
@ -1750,7 +1750,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.0.0 ${requirements_ecore_evas}"
|
||||
requirements_ecore_evas="ecore-win32 >= 1.1.0 ${requirements_ecore_evas}"
|
||||
fi
|
||||
|
||||
# ecore_evas_software_sdl
|
||||
|
|
@ -1759,7 +1759,7 @@ ECORE_EVAS_CHECK_MODULE([software-sdl],
|
|||
[${want_ecore_evas_software_sdl}],
|
||||
[Software SDL],
|
||||
[${have_ecore_sdl}],
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_gl_sdl
|
||||
|
||||
|
|
@ -1767,7 +1767,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-sdl],
|
|||
[${want_ecore_evas_gl_sdl}],
|
||||
[OpenGL SDL],
|
||||
[${have_ecore_sdl}],
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-sdl >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_cocoa
|
||||
|
||||
|
|
@ -1775,7 +1775,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-cocoa],
|
|||
[${want_ecore_evas_gl_cocoa}],
|
||||
[OpenGL Cocoa],
|
||||
[${have_ecore_cocoa}],
|
||||
[requirements_ecore_evas="ecore-cocoa >= 1.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-cocoa >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_directfb
|
||||
|
||||
|
|
@ -1783,7 +1783,7 @@ ECORE_EVAS_CHECK_MODULE([directfb],
|
|||
[${want_ecore_evas_directfb}],
|
||||
[DirectFB],
|
||||
[${have_ecore_directfb}],
|
||||
[requirements_ecore_evas="ecore-directfb >= 1.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-directfb >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_fb
|
||||
|
||||
|
|
@ -1791,7 +1791,7 @@ ECORE_EVAS_CHECK_MODULE([fb],
|
|||
[${want_ecore_evas_fb}],
|
||||
[Linux Framebuffer],
|
||||
[${have_ecore_fb}],
|
||||
[requirements_ecore_evas="ecore-fb >= 1.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-fb >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_wince
|
||||
|
||||
|
|
@ -1799,7 +1799,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.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-wince >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
# ecore_evas_ews
|
||||
|
||||
|
|
@ -1814,7 +1814,7 @@ ECORE_EVAS_CHECK_MODULE([psl1ght],
|
|||
[${want_ecore_evas_psl1ght}],
|
||||
[PSL1GHT],
|
||||
[${have_ecore_psl1ght}],
|
||||
[requirements_ecore_evas="ecore-psl1ght >= 1.0.0 ${requirements_ecore_evas}"])
|
||||
[requirements_ecore_evas="ecore-psl1ght >= 1.1.0 ${requirements_ecore_evas}"])
|
||||
|
||||
### install and build examples
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [0])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [1])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##-- When doing snapshots - change soname. remove dnl on below line
|
||||
dnl m4_define([relname], [ver-pre-svn-07])
|
||||
dnl m4_define([v_rel], [-release relname])
|
||||
|
|
@ -256,37 +256,37 @@ fi
|
|||
|
||||
PKG_CHECK_MODULES([MINIMAL],
|
||||
[
|
||||
eina >= 1.0.0
|
||||
eet >= 1.4.0
|
||||
eina >= 1.1.0
|
||||
eet >= 1.5.0
|
||||
])
|
||||
|
||||
PKG_CHECK_MODULES([EDJE],
|
||||
[
|
||||
eina >= 1.0.0
|
||||
eet >= 1.4.0
|
||||
evas >= 1.0.999
|
||||
ecore >= 1.0.0
|
||||
ecore-evas >= 1.0.0
|
||||
ecore-file >= 1.0.0
|
||||
embryo >= 1.0.0
|
||||
eina >= 1.1.0
|
||||
eet >= 1.5.0
|
||||
evas >= 1.1.0
|
||||
ecore >= 1.1.0
|
||||
ecore-evas >= 1.1.0
|
||||
ecore-file >= 1.1.0
|
||||
embryo >= 1.1.0
|
||||
])
|
||||
|
||||
EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
|
||||
EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
|
||||
|
||||
requirement_edje="embryo >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_edje}"
|
||||
requirement_edje="embryo >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_edje}"
|
||||
requirement_edje="${requirement_lua} ${requirement_edje}"
|
||||
|
||||
have_ecore_imf="no"
|
||||
PKG_CHECK_MODULES([ECORE_IMF],
|
||||
[
|
||||
ecore-imf >= 1.0.0
|
||||
ecore-imf-evas >= 1.0.0
|
||||
ecore-imf >= 1.1.0
|
||||
ecore-imf-evas >= 1.1.0
|
||||
],
|
||||
[
|
||||
AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry])
|
||||
have_ecore_imf="yes"
|
||||
requirement_edje="ecore-imf-evas >= 1.0.0 ecore-imf >= 1.0.0 ${requirement_edje}"
|
||||
requirement_edje="ecore-imf-evas >= 1.1.0 ecore-imf >= 1.1.0 ${requirement_edje}"
|
||||
],
|
||||
[have_ecore_imf="no"])
|
||||
|
||||
|
|
@ -391,12 +391,12 @@ AC_ARG_ENABLE([flac],
|
|||
if test "x${want_multisense}" = "xyes" -a "x$want_alsa_lib" != "xno"; then
|
||||
PKG_CHECK_MODULES([ALSA],
|
||||
[
|
||||
alsa >= 1.0.21a
|
||||
alsa >= 1.0.21
|
||||
],
|
||||
[
|
||||
AC_DEFINE(HAVE_LIBALSA, 1, [ALSA support for Edje])
|
||||
have_alsa_lib="yes"
|
||||
requirement_edje="alsa >= 1.0.21a ${requirement_edje}"
|
||||
requirement_edje="alsa >= 1.0.21 ${requirement_edje}"
|
||||
],
|
||||
[have_alsa_lib="no"; want_multisense="no"]
|
||||
)
|
||||
|
|
@ -443,26 +443,26 @@ fi
|
|||
# Dependencies for the binaries
|
||||
|
||||
if test "x$have_edje_cc" = "xyes"; then
|
||||
PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
|
||||
PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0])
|
||||
EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
|
||||
|
||||
if test "x$have_edje_decc" = "xyes"; then
|
||||
PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
|
||||
PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0])
|
||||
fi
|
||||
|
||||
if test "x$have_edje_player" = "xyes"; then
|
||||
PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
|
||||
PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0])
|
||||
fi
|
||||
|
||||
if test "x$have_edje_inspector" = "xyes"; then
|
||||
PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
|
||||
PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0])
|
||||
fi
|
||||
|
||||
if test "x$have_edje_external_inspector" = "xyes"; then
|
||||
PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
|
||||
PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0])
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
y##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [4])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [5])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##-- When doing snapshots - change soname. remove dnl on below line
|
||||
dnl m4_define([relname], [ver-pre-svn-05])
|
||||
dnl m4_define([v_rel], [-release relname])
|
||||
|
|
@ -264,8 +264,8 @@ AC_SUBST(EET_LIBS)
|
|||
|
||||
# Eina library
|
||||
|
||||
PKG_CHECK_MODULES(EINA, [eina >= 1.0.0])
|
||||
requirement_eet="eina >= 1.0.0 ${requirement_eet}"
|
||||
PKG_CHECK_MODULES(EINA, [eina >= 1.1.0])
|
||||
requirement_eet="eina >= 1.1.0 ${requirement_eet}"
|
||||
|
||||
# Gnutls library
|
||||
have_gnutls="no"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [0])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [1])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])])
|
||||
m4_define([lt_cur], m4_eval(v_maj + v_min))
|
||||
|
|
@ -58,7 +58,7 @@ AC_SUBST(VMAJ)
|
|||
AC_CANONICAL_BUILD
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
requirement_eeze="ecore >= 1.0.0 eina >= 1.0.0 libudev"
|
||||
requirement_eeze="ecore >= 1.1.0 eina >= 1.1.0 libudev"
|
||||
|
||||
|
||||
### Checks for programs
|
||||
|
|
@ -114,9 +114,9 @@ if test "x$eeze_mount" = "xyes";then
|
|||
AC_ARG_WITH([eject], AS_HELP_STRING([--with-eject], [specify eject bin @<:@default=detect@:>@]))
|
||||
PKG_CHECK_MODULES([LIBMOUNT], [mount >= 2.18.0])
|
||||
mount_v=$(pkg-config --modversion mount)
|
||||
PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0])
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.4.0])
|
||||
PKG_CHECK_MODULES([ECORE_CON], [ecore-con >= 1.0.0])
|
||||
PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.1.0])
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.5.0])
|
||||
PKG_CHECK_MODULES([ECORE_CON], [ecore-con >= 1.1.0])
|
||||
|
||||
if test "x$with_mount" = "xdetect";then
|
||||
AC_PATH_PROG([with_mount], [mount], [no])
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [0])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [1])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##-- When doing snapshots - change soname. remove dnl on below line
|
||||
dnl m4_define([relname], [ver-pre-svn-07])
|
||||
dnl m4_define([v_rel], [-release relname])
|
||||
|
|
@ -147,9 +147,9 @@ AC_SUBST(EFL_EFREET_BUILD)
|
|||
AC_SUBST(EFL_EFREET_MIME_BUILD)
|
||||
AC_SUBST(EFL_EFREET_TRASH_BUILD)
|
||||
|
||||
requirement_efreet="ecore-file >= 1.0.0 ecore >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_efreet}"
|
||||
requirement_efreet="ecore-file >= 1.1.0 ecore >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_efreet}"
|
||||
PKG_CHECK_MODULES(EFREET, [${requirement_efreet}])
|
||||
PKG_CHECK_MODULES(EINA, [eina >= 1.0.0])
|
||||
PKG_CHECK_MODULES(EINA, [eina >= 1.1.0])
|
||||
|
||||
|
||||
### Checks for header files
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [0])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [1])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##-- When doing snapshots - change soname. remove dnl on below line
|
||||
dnl m4_define([relname], [ver-pre-svn-07])
|
||||
dnl m4_define([v_rel], [-release relname])
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [0])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [1])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##-- When doing snapshots - change soname. remove dnl on below line
|
||||
dnl m4_define([relname], [ver-pre-svn-07])
|
||||
dnl m4_define([v_rel], [-release ver-pre-svn-07])
|
||||
|
|
@ -107,7 +107,7 @@ esac
|
|||
AC_SUBST(EFL_EMBRYO_BUILD)
|
||||
|
||||
# For embryo_cc_prefix.c
|
||||
PKG_CHECK_MODULES([EINA], [eina >= 1.0.999])
|
||||
PKG_CHECK_MODULES([EINA], [eina >= 1.1.0])
|
||||
|
||||
### Checks for header files
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [1])
|
||||
m4_define([v_min], [0])
|
||||
m4_define([v_mic], [999])
|
||||
m4_define([v_min], [1])
|
||||
m4_define([v_mic], [0])
|
||||
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']))
|
||||
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']))])
|
||||
##-- When released, remove the dnl on the below line
|
||||
dnl m4_undefine([v_rev])
|
||||
m4_undefine([v_rev])
|
||||
##-- When doing snapshots - change soname. remove dnl on below line
|
||||
dnl m4_define([relname], [ver-pre-svn-07])
|
||||
dnl m4_define([v_rel], [-release relname])
|
||||
|
|
@ -243,7 +243,7 @@ esac
|
|||
## strong dependencies
|
||||
|
||||
# Eina
|
||||
PKG_CHECK_MODULES([EINA], [eina >= 1.0.999])
|
||||
PKG_CHECK_MODULES([EINA], [eina >= 1.1.0])
|
||||
CPPFLAGS_SAVE="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $EINA_CFLAGS"
|
||||
AC_CHECK_SIZEOF(Eina_Unicode,, [#include <Eina.h>])
|
||||
|
|
@ -252,7 +252,7 @@ CPPFLAGS="$CPPFLAGS_SAVE"
|
|||
# Freetype
|
||||
PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.3.0])
|
||||
|
||||
requirement_evas="freetype2 eina >= 1.0.0 ${requirement_evas}"
|
||||
requirement_evas="freetype2 eina >= 1.1.0 ${requirement_evas}"
|
||||
|
||||
## optional dependencies
|
||||
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then
|
|||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
if test "x$2" = "xyes" ; then
|
||||
x_libs="${x_libs} -lX11 -lXext -lXrender"
|
||||
|
|
@ -168,7 +168,7 @@ else
|
|||
if test "x${have_egl}" = "xyes" ; then
|
||||
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
|
||||
if test "x${have_glesv2}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
evas_engine_[]$1[]_cflags="${x_cflags}"
|
||||
evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
||||
|
|
@ -306,7 +306,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then
|
|||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
if test "x$2" = "xyes" ; then
|
||||
x_libs="${x_libs} -lX11 -lXext -lXrender"
|
||||
|
|
@ -338,7 +338,7 @@ else
|
|||
if test "x${have_egl}" = "xyes" ; then
|
||||
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
|
||||
if test "x${have_glesv2}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
|
||||
evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
|
||||
|
|
@ -483,7 +483,7 @@ LIBS="$LIBS_save"
|
|||
AC_LANG_POP([Objective C])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
|
||||
fi
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ have_dep="no"
|
|||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.4.0], [have_dep="yes" requirement="eet >= 1.4.0"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.5.0], [have_dep="yes" requirement="eet >= 1.4.0"], [have_dep="no"])
|
||||
evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}"
|
||||
evas_image_loader_[]$1[]_libs="${EET_LIBS}"
|
||||
|
||||
|
|
@ -542,7 +542,7 @@ AC_MSG_CHECKING([whether to enable Eet font loader])
|
|||
AC_MSG_RESULT([${want_loader}])
|
||||
|
||||
if test "x$want_loader" = "xyes" -o "x$want_loader" = "xauto"; then
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.4.0], [have_evas_font_loader_eet="yes"], [have_evas_font_loader_eet="no"])
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.5.0], [have_evas_font_loader_eet="yes"], [have_evas_font_loader_eet="no"])
|
||||
fi
|
||||
|
||||
if test "x${have_evas_font_loader_eet}" = "xno" -a "x$want_loader" = "xyes" -a "x$use_strict" = "xyes" ; then
|
||||
|
|
@ -551,7 +551,7 @@ fi
|
|||
|
||||
if test "x$have_evas_font_loader_eet" = "xyes" ; then
|
||||
AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support])
|
||||
requirement_evas="eet >= 1.4.0 ${requirement_evas}"
|
||||
requirement_evas="eet >= 1.5.0 ${requirement_evas}"
|
||||
fi
|
||||
|
||||
popdef([UP])
|
||||
|
|
|
|||
Loading…
Reference in New Issue