m4_define([v_maj], [0])
m4_define([v_min], [7])
m4_define([v_mic], [0])
-m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
+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])
##-- When doing snapshots - change soname. remove dnl on below line
-m4_define([relname], [ver-pre-svn-06])
+m4_define([relname], [ver-pre-svn-07])
m4_define([v_rel], [-release relname])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])],
AM_CONFIG_HEADER([elementary_config.h])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
+AC_GNU_SOURCE
+
AC_C_BIGENDIAN
AC_ISC_POSIX
AC_PROG_CC
AC_SUBST(VMAJ)
AC_SUBST(VMIN)
+VERSION="1.0.0"
+
+EDJE_VERSION="1.0.0"
+
case "$host_os" in
mingw32ce* | cegcc*)
MODULE_ARCH="$host_os-$host_cpu"
+ MODULE_EDJE="$host_os-$host_cpu"
;;
*)
- MODULE_ARCH="$host_os-$host_cpu-relname"
+ MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
+ MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
;;
esac
AC_SUBST(release_info)
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
+AC_SUBST(MODULE_EDJE)
+AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
EFL_SHARED_EXTENSION="${shrext_cmds}"
AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension")
PKG_CHECK_MODULES([ELEMENTARY],
[
- eina-0 >= 0.0.1
- eet >= 1.2.3
- evas >= 0.9.9
- ecore >= 0.9.9
- ecore-evas >= 0.9.9
- ecore-file >= 0.9.9
- ecore-imf >= 0.9.9
- edje >= 0.9.9
+ eina >= 1.0.0
+ eet >= 1.4.0
+ evas >= 1.0.0
+ ecore >= 1.0.0
+ ecore-evas >= 1.0.0
+ ecore-file >= 1.0.0
+ ecore-imf >= 1.0.0
+ edje >= ${EDJE_VERSION}
]
)
-AC_ARG_WITH(eet-eet,
-[ --with-eet-eet=PATH specify a specific path to eet utility],
-[
- v=$withval;
- eet_eet=$v
- echo " Elementary eet explicitly set to "$eet_eet;
-],[
- eet_eet=$(pkg-config --variable=prefix eet)/bin/eet
-])
-AC_SUBST(eet_eet)
-
-requirement_elm="edje ecore-file ecore-evas ecore evas eet eina-0 ${requirement_elm}"
+requirement_elm="edje >= ${EDJE_VERSION} ecore-file >= 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_elm}"
have_elementary_x="no"
want_elementary_x="auto"
if test "x$want_elementary_x" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_X],
- [ecore-x],
+ [ecore-x >= 1.0.0],
[
AC_DEFINE(HAVE_ELEMENTARY_X, 1, [X11 support for Elementary])
have_elementary_x="yes"
- requirement_elm="ecore-x ${requirement_elm}"
+ requirement_elm="ecore-x >= 1.0.0 ${requirement_elm}"
],
[have_elementary_x="no"]
)
AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.])
fi
+have_conformant_autoscroll="no"
+want_conformant_autoscroll="yes"
+AC_ARG_ENABLE([ecore-x],
+ [AC_HELP_STRING([--disable-ecore-x], [disable ecore-x support. @<:@default=detect@:>@])],
+ [want_conformant_autoscroll=$enableval], [])
+
+if test "x$want_conformant_autoscroll" != "xno"; then
+ PKG_CHECK_MODULES([ELEMENTARY_X],
+ [ecore-x >= 1.0.0],
+ [
+ AC_DEFINE(HAVE_CONFORMANT_AUTOSCROLL, 1, [autoscroll with conformant])
+ have_conformant_autoscroll="yes"
+ requirement_elm="ecore-x >= 1.0.0 ${requirement_elm}"
+ ],
+ [have_conformant_autoscroll="no"]
+ )
+else
+ have_conformant_autoscroll="no"
+fi
+if test "x$want_conformant_autoscroll" = "xyes" -a "x$have_conformant_autoscroll" = "xno"; then
+ AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.])
+fi
have_elementary_fb="no"
want_elementary_fb="auto"
if test "x$want_elementary_fb" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_FB],
- [ecore-fb],
+ [ecore-fb >= 1.0.0],
[
AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary])
have_elementary_fb="yes"
- requirement_elm="ecore-fb ${requirement_elm}"
+ requirement_elm="ecore-fb >= 1.0.0 ${requirement_elm}"
],
[have_elementary_fb="no"]
)
if test "x$want_elementary_sdl" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_SDL],
- [ecore-sdl],
+ [ecore-sdl >= 1.0.0],
[
AC_DEFINE(HAVE_ELEMENTARY_SDL, 1, [SDL support for Elementary])
have_elementary_sdl="yes"
- requirement_elm="ecore-sdl ${requirement_elm}"
+ requirement_elm="ecore-sdl >= 1.0.0 ${requirement_elm}"
],
[have_elementary_sdl="no"]
)
if test "x$want_elementary_win32" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_WIN32],
- [ecore-win32],
+ [ecore-win32 >= 1.0.0],
[
AC_DEFINE(HAVE_ELEMENTARY_WIN32, 1, [Windows XP support for Elementary])
have_elementary_win32="yes"
- requirement_elm="ecore-win32 ${requirement_elm}"
+ requirement_elm="ecore-win32 >= 1.0.0 ${requirement_elm}"
],
[have_elementary_win32="no"]
)
if test "x$want_elementary_wince" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_WINCE],
- [ecore-wince],
+ [ecore-wince >= 1.0.0],
[
AC_DEFINE(HAVE_ELEMENTARY_WINCE, 1, [Windows CE support for Elementary])
have_elementary_wince="yes"
- requirement_elm="ecore-wince ${requirement_elm}"
+ requirement_elm="ecore-wince >= 1.0.0 ${requirement_elm}"
],
[have_elementary_wince="no"]
)
if test "x$want_elementary_edbus" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
[
- edbus
- ehal
+ edbus >= 1.0.0
+ ehal >= 1.0.0
],
[
AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
have_elementary_edbus="yes"
ELM_EDBUS_DEF="#define"
- requirement_elm="ehal edbus ${requirement_elm}"
+ requirement_elm="ehal >= 1.0.0 edbus >= 1.0.0 ${requirement_elm}"
],
[have_elementary_edbus="no"]
)
if test "x$want_elementary_efreet" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_EFREET],
[
- efreet
- efreet-mime
- efreet-trash
+ efreet >= 1.0.0
+ efreet-mime >= 1.0.0
+ efreet-trash >= 1.0.0
],
[
AC_DEFINE(HAVE_ELEMENTARY_EFREET, 1, [Efreet support for Elementary])
have_elementary_efreet="yes"
ELM_EFREET_DEF="#define"
- requirement_elm="efreet efreet-mime efreet-trash ${requirement_elm}"
+ requirement_elm="efreet >= 1.0.0 efreet-mime >= 1.0.0 efreet-trash >= 1.0.0 ${requirement_elm}"
],
[have_elementary_efreet="no"]
)
fi
AC_SUBST(ELM_EWEATHER_DEF)
-ELM_EWEBKIT_DEF="#undef"
-have_elementary_ewebkit="no"
-want_elementary_ewebkit="auto"
-AC_ARG_ENABLE([ewebkit],
- [AC_HELP_STRING([--disable-ewebkit], [disable ewebkit support. @<:@default=detect@:>@])],
- [want_elementary_ewebkit=$enableval], [])
-
-if test "x$want_elementary_ewebkit" != "xno"; then
- PKG_CHECK_MODULES([ELEMENTARY_EWEBKIT],
- [
- ewebkit
- ],
- [
- AC_DEFINE(HAVE_ELEMENTARY_EWEBKIT, 1, [EWebKit support for Elementary])
- have_elementary_ewebkit="yes"
- ELM_EWEBKIT_DEF="#define"
- requirement_elm="ewebkit ${requirement_elm}"
- ],
- [have_elementary_ewebkit="no"]
- )
-else
- have_elementary_ewebkit="no"
-fi
-if test "x$want_elementary_ewebkit" = "xyes" -a "x$have_elementary_ewebkit" = "xno"; then
- AC_MSG_ERROR([EWebKit support requested, but no ewebkit found by pkg-config.])
-fi
-AC_SUBST(ELM_EWEBKIT_DEF)
-
ELM_ETHUMB_DEF="#undef"
have_elementary_ethumb="no"
want_elementary_ethumb="auto"
AC_DEFINE(HAVE_ELEMENTARY_ETHUMB, 1, [Ethumb support for Elementary])
have_elementary_ethumb="yes"
ELM_ETHUMB_DEF="#define"
- requirement_elm="ethumb ${requirement_elm}"
+ requirement_elm="ethumb_client ${requirement_elm}"
],
[have_elementary_ethumb="no"]
)
fi
AC_SUBST(ELM_ETHUMB_DEF)
+ELM_DEBUG_DEF="#undef"
+want_elementary_debug="no"
+AC_ARG_ENABLE([debug],
+ [AC_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])],
+ [want_elementary_debug=$enableval], [])
+
+if test "x$want_elementary_debug" = "xyes"; then
+ AC_DEFINE(HAVE_ELEMENTARY_DEBUG, 1, [Elementary debug.])
+ ELM_DEBUG_DEF="#define"
+fi
+AC_SUBST(ELM_DEBUG_DEF)
+
ELM_ALLOCA_H_DEF="#undef"
AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"])
AC_SUBST(ELM_ALLOCA_H_DEF)
AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
AC_SUBST(ELM_LIBINTL_H_DEF)
-AC_ARG_WITH(edje-cc,
-[ --with-edje-cc=PATH specify a specific path to edje_cc],
-[
- v=$withval;
- edje_cc=$v
- echo " Elementary edje_cc explicitly set to "$edje_cc;
-],[
- edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
-])
-AC_SUBST(edje_cc)
-
my_libs="-lm"
AC_SUBST(my_libs)
AC_SUBST(requirement_elm)
+EFL_WITH_BIN([eet], [eet-eet], [eet])
+EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
+
EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
AC_OUTPUT([
src/bin/Makefile
src/modules/Makefile
src/modules/test_entry/Makefile
+src/modules/test_map/Makefile
src/modules/ctxpopup_copypasteUI/Makefile
+src/modules/ctxpopup_copypasteshareUI/Makefile
src/modules/popup_copypasteUI/Makefile
src/edje_externals/Makefile
data/Makefile
config/default/Makefile
config/standard/Makefile
config/illume/Makefile
+config/slp/Makefile
])
#####################################################################
echo " EFreet.............: ${have_elementary_efreet}"
echo " EWeather...........: ${have_elementary_eweather}"
echo " Ethumb.............: ${have_elementary_ethumb}"
-echo " EWebKit............: ${have_elementary_ewebkit}"
+echo " Xml2...............: ${have_elementary_libxml2}"
echo
+echo " eet..................: ${eet_eet}"
echo " edje_cc..............: ${edje_cc}"
echo
echo "Compilation............: make (or gmake)"
projects / framework / uifw / elementary.git / blobdiff