Evas (wayland): We should also check for framespace changes here and

[profile/ivi/evas.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 834e6fe..7757d81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
-m4_define([v_min], [2])
-m4_define([v_mic], [99])
+m4_define([v_min], [7])
+m4_define([v_mic], [0])
 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']))
 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])
@@ -31,7 +31,7 @@ AC_CACHE_CHECK([whether the Objective C compiler works],
                 AC_LANG_POP([Objective C])])], [rw_cv_prog_objc_works=no])
 ])
 
-AC_INIT([evas], [v_ver], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([evas], [v_ver-alpha], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -259,7 +259,7 @@ AM_CONDITIONAL([EVAS_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
 ## strong dependencies
 
 # Eina
-PKG_CHECK_MODULES([EINA], [eina >= 1.2.0])
+PKG_CHECK_MODULES([EINA], [eina >= 1.6.0])
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $EINA_CFLAGS"
 AC_CHECK_SIZEOF(Eina_Unicode,, [#include <Eina.h>])
@@ -268,7 +268,7 @@ CPPFLAGS="$CPPFLAGS_SAVE"
 # Freetype
 PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.3.0])
 
-requirement_evas="freetype2 eina >= 1.2.0 ${requirement_evas}"
+requirement_evas="freetype2 eina >= 1.6.0 ${requirement_evas}"
 
 ## optional dependencies
 
@@ -1147,23 +1147,27 @@ AC_ARG_ENABLE(pthreads,
 ## Pipe Renderer
 build_pipe_render="no"
 
-AC_MSG_CHECKING(whether to build Threaded Pipe Rendering support)
-AC_ARG_ENABLE(pipe-render,
-  AC_HELP_STRING([--enable-pipe-render], [enable threaded pipe rendering support]),
-  [ build_pipe_render=$enableval ]
-)
-AC_MSG_RESULT($build_pipe_render)
-
-AC_MSG_CHECKING(whether we can build Threaded Pipe Rendering support)
-if test \( "x$build_pipe_render" = "xyes" -o "x$build_pipe_render" = "xauto" \); then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(BUILD_PIPE_RENDER, 1, [Build pipe render support])
-  build_pipe_render="yes"
-  need_pthreads="yes"
-else
-  AC_MSG_RESULT(no)
-  build_pipe_render="no"
-fi
+# Let disable pipe render strongly as it doesn't massively improve performance, but
+# just hammer more watt for a few more percent. The code is kept as the understanding
+# is that with an async pipeline things will be better.
+#
+#AC_MSG_CHECKING(whether to build Threaded Pipe Rendering support)
+#AC_ARG_ENABLE(pipe-render,
+#  AC_HELP_STRING([--enable-pipe-render], [enable threaded pipe rendering support]),
+#  [ build_pipe_render=$enableval ]
+#)
+#AC_MSG_RESULT($build_pipe_render)
+
+#AC_MSG_CHECKING(whether we can build Threaded Pipe Rendering support)
+#if test \( "x$build_pipe_render" = "xyes" -o "x$build_pipe_render" = "xauto" \); then
+#  AC_MSG_RESULT(yes)
+#  AC_DEFINE(BUILD_PIPE_RENDER, 1, [Build pipe render support])
+#  build_pipe_render="yes"
+#  need_pthreads="yes"
+#else
+#  AC_MSG_RESULT(no)
+#  build_pipe_render="no"
+#fi
 
 #######################################
 ## Async events
@@ -1515,45 +1519,6 @@ if test "x$want_evas_magic_debug" = "xyes"; then
   AC_DEFINE(EVAS_MAGIC_DEBUG, 1, [complain when people pass in wrong object types etc.])
 fi
 
-
-#######################################
-## Word Caching
-want_word_cache="no"
-AC_MSG_CHECKING(whether to enable caching of rendered words)
-AC_ARG_ENABLE(word-cache,
-  AC_HELP_STRING(
-    [--enable-word-cache],
-    [Enable experimental word caching to speed up rendering [[default=disabled]]]
-  ),
-  [ want_word_cache="$enableval" ]
-)
-AC_MSG_RESULT($want_word_cache)
-
-AM_CONDITIONAL(WORD_CACHE, test "x$want_word_cache" = "xyes")
-if test "x$want_word_cache" = "xyes"; then
-  AC_DEFINE(WORD_CACHE, 1, [Experimental word caching to speed up text rendering.])
-fi
-
-#######################################
-## Metric Caching
-want_metric_cache="no"
-AC_MSG_CHECKING(whether to enable caching of rendered metrics)
-AC_ARG_ENABLE(metric-cache,
-  AC_HELP_STRING(
-    [--enable-metric-cache],
-    [Enable experimental metric caching to speed up rendering [[default=disabled]]]
-  ),
-  [ want_metric_cache="$enableval" ]
-)
-AC_MSG_RESULT($want_metric_cache)
-
-AM_CONDITIONAL(METRIC_CACHE, test "x$want_metric_cache" = "xyes")
-if test "x$want_metric_cache" = "xyes"; then
-  AC_DEFINE(METRIC_CACHE, 1, [Experimental metric caching to speed up text rendering.])
-fi
-
-
-
 #####################################################################
 ## ARGB engine options
 
@@ -1941,6 +1906,7 @@ src/static_deps/liblinebreak/Makefile
 src/lib/include/Makefile
 src/examples/Makefile
 src/tests/Makefile
+data/Makefile
 evas.spec
 ])
 
@@ -2059,9 +2025,6 @@ echo "  Threaded Pipe Rendering.: $build_pipe_render"
 echo "  Async Events............: $build_async_events"
 echo "  Async Image Preload.....: $build_async_preload"
 echo
-echo "  Word Cache..............: $want_word_cache"
-echo "  Metric Cache............: $want_metric_cache"
-echo
 echo "  Pixman..................: $have_pixman"
 echo "  Pixman Fonts............: $have_pixman_font"
 echo "  Pixman Rects............: $have_pixman_rect"