X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=fcfbb5a52e992237fb972fd03302e0ba050f9575;hb=f2bf1a15075b8302f94a8eceee85945829d262dd;hp=a8a6e241cb630fb22362adb60c78c834289e678d;hpb=7090cc2fd73ea300dfd3120339f73cdf92229c94;p=framework%2Fuifw%2Felementary.git diff --git a/configure.ac b/configure.ac index a8a6e24..fcfbb5a 100755 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,25 @@ -# get rid of that stupid cache mechanism -rm -f config.cache - -AC_INIT([elementary], [0.6.0.063], [enlightenment-devel@lists.sourceforge.net]) -release="ver-pre-svn-05" +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_define([v_maj], [0]) +m4_define([v_min], [7]) +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]) +##-- When doing snapshots - change soname. remove dnl on below line +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])], +[m4_define([v_ver], [v_maj.v_min.v_mic])]) +m4_define([lt_rev], m4_eval(v_maj + v_min)) +m4_define([lt_cur], v_mic) +m4_define([lt_age], v_min) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## + +AC_INIT([elementary], [v_ver], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) @@ -13,8 +30,8 @@ AM_INIT_AUTOMAKE([1.6 dist-bzip2]) 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 @@ -29,25 +46,44 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl AC_PROG_LIBTOOL -VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'` -VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'` -VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'` -SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'` -version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) +m4_ifdef([v_rel], , [m4_define([v_rel], [])]) +AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) +AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) +AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) +AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) +version_info="lt_rev:lt_cur:lt_age" +release_info="v_rel" AC_SUBST(version_info) +AC_SUBST(release_info) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +VMAJ=v_maj +VMIN=v_min +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" ;; *) - release_info="-release $release" - MODULE_ARCH="$host_os-$host_cpu-$release" + 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") @@ -137,28 +173,18 @@ AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) 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 - edje >= 0.9.91 + 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" @@ -168,11 +194,11 @@ AC_ARG_ENABLE([ecore-x], 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"] ) @@ -183,6 +209,28 @@ if test "x$want_elementary_x" = "xyes" -a "x$have_elementary_x" = "xno"; then 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" @@ -192,11 +240,11 @@ AC_ARG_ENABLE([ecore-fb], 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"] ) @@ -215,11 +263,11 @@ AC_ARG_ENABLE([ecore-sdl], 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"] ) @@ -238,11 +286,11 @@ AC_ARG_ENABLE([ecore-win32], 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"] ) @@ -261,11 +309,11 @@ AC_ARG_ENABLE([ecore-wince], 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"] ) @@ -286,14 +334,14 @@ AC_ARG_ENABLE([edbus], 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"] ) @@ -315,15 +363,15 @@ AC_ARG_ENABLE([efreet], 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"] ) @@ -379,7 +427,7 @@ if test "x$want_elementary_ethumb" != "xno"; then 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"] ) @@ -391,34 +439,44 @@ if test "x$want_elementary_ethumb" = "xyes" -a "x$have_elementary_ethumb" = "xno fi AC_SUBST(ELM_ETHUMB_DEF) -ELM_IMF_DEF="#undef" -have_elementary_imf="no" -want_elementary_imf="auto" -AC_ARG_ENABLE([imf], - [AC_HELP_STRING([--disable-imf], [disable imf support. @<:@default=detect@:>@])], - [want_elementary_imf=$enableval], []) +ELM_SQLITE3_DEF="#undef" +have_elementary_sqlite3="no" +want_elementary_sqlite3="auto" +AC_ARG_ENABLE([sqlite3], + [AC_HELP_STRING([--disable-sqlite3], [disable sqlite3 support. @<:@default=detect@:>@])], + [want_elementary_sqlite3=$enableval], []) -if test "x$want_elementary_imf" != "xno"; then - PKG_CHECK_MODULES([ELEMENTARY_IMF], +if test "x$want_elementary_sqlite3" != "xno"; then + PKG_CHECK_MODULES([ELEMENTARY_SQLITE3], [ - ecore-imf + sqlite3 ], [ - AC_DEFINE(HAVE_ELEMENTARY_IMF, 1, [Input Method Framework support for Elementary]) - have_elementary_imf="yes" - ELM_IMF_DEF="#define" - requirement_elm="ecore-imf ${requirement_elm}" + AC_DEFINE(HAVE_ELEMENTARY_SQLITE3, 1, [sqlite3 support for Elementary]) + have_elementary_sqlite3="yes" + ELM_SQLITE3_DEF="#define" + requirement_elm="sqlite3 ${requirement_elm}" ], - [have_elementary_imf="no"] + [have_elementary_sqlite3="no"] ) else - have_elementary_imf="no" + have_elementary_sqlite3="no" fi -if test "x$want_elementary_imf" = "xyes" -a "x$have_elementary_imf" = "xno"; then - AC_MSG_ERROR([IMF support requested, but no ecore-imf found by pkg-config.]) +if test "x$want_elementary_sqlite3" = "xyes" -a "x$have_elementary_sqlite3" = "xno"; then + AC_MSG_ERROR(sqlite3 support requested, but no sqlite3 found by pkg-config.]) fi -AC_SUBST(ELM_IMF_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"]) @@ -428,21 +486,22 @@ ELM_LIBINTL_H_DEF="#undef" 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 +EFL_CHECK_THREADS([ + TH=1 +] , [ + AC_MSG_ERROR(no thread support found. required.) + exit 1 ]) -AC_SUBST(edje_cc) +AC_SUBST(EFL_PTHREAD_CFLAGS) +AC_SUBST(EFL_PTHREAD_LIBS) 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([ @@ -457,7 +516,9 @@ src/lib/Elementary.h 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 @@ -470,6 +531,7 @@ config/Makefile config/default/Makefile config/standard/Makefile config/illume/Makefile +config/slp/Makefile ]) ##################################################################### @@ -496,8 +558,9 @@ echo " EDBus..............: ${have_elementary_edbus}" echo " EFreet.............: ${have_elementary_efreet}" echo " EWeather...........: ${have_elementary_eweather}" echo " Ethumb.............: ${have_elementary_ethumb}" -echo " IMF................: ${have_elementary_imf}" +echo " Xml2...............: ${have_elementary_libxml2}" echo +echo " eet..................: ${eet_eet}" echo " edje_cc..............: ${edje_cc}" echo echo "Compilation............: make (or gmake)"