diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/configure.ac | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/configure.ac | 53 |
1 files changed, 24 insertions, 29 deletions
diff --git a/libraries/evas/configure.ac b/libraries/evas/configure.ac index 5424e31..c832384 100644 --- a/libraries/evas/configure.ac +++ b/libraries/evas/configure.ac | |||
@@ -1,12 +1,12 @@ | |||
1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [1]) | 4 | m4_define([v_min], [2]) |
5 | m4_define([v_mic], [99]) | 5 | m4_define([v_mic], [0]) |
6 | 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'])) | 6 | 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'])) |
7 | 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']))]) | 7 | 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']))]) |
8 | ##-- When released, remove the dnl on the below line | 8 | ##-- When released, remove the dnl on the below line |
9 | dnl m4_undefine([v_rev]) | 9 | m4_undefine([v_rev]) |
10 | ##-- When doing snapshots - change soname. remove dnl on below line | 10 | ##-- When doing snapshots - change soname. remove dnl on below line |
11 | dnl m4_define([relname], [ver-pre-svn-07]) | 11 | dnl m4_define([relname], [ver-pre-svn-07]) |
12 | dnl m4_define([v_rel], [-release relname]) | 12 | dnl m4_define([v_rel], [-release relname]) |
@@ -31,7 +31,7 @@ AC_CACHE_CHECK([whether the Objective C compiler works], | |||
31 | AC_LANG_POP([Objective C])])], [rw_cv_prog_objc_works=no]) | 31 | AC_LANG_POP([Objective C])])], [rw_cv_prog_objc_works=no]) |
32 | ]) | 32 | ]) |
33 | 33 | ||
34 | AC_INIT([evas], [v_ver], [enlightenment-devel@lists.sourceforge.net]) | 34 | AC_INIT([evas], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net]) |
35 | AC_PREREQ([2.52]) | 35 | AC_PREREQ([2.52]) |
36 | AC_CONFIG_SRCDIR([configure.ac]) | 36 | AC_CONFIG_SRCDIR([configure.ac]) |
37 | AC_CONFIG_MACRO_DIR([m4]) | 37 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -98,7 +98,6 @@ want_evas_engine_software_xlib="no" | |||
98 | want_evas_engine_software_xcb="no" | 98 | want_evas_engine_software_xcb="no" |
99 | want_evas_engine_software_gdi="no" | 99 | want_evas_engine_software_gdi="no" |
100 | want_evas_engine_software_ddraw="no" | 100 | want_evas_engine_software_ddraw="no" |
101 | want_evas_engine_software_sdl="no" | ||
102 | want_evas_engine_software_8_x11="no" | 101 | want_evas_engine_software_8_x11="no" |
103 | want_evas_engine_software_16_x11="no" | 102 | want_evas_engine_software_16_x11="no" |
104 | want_evas_engine_software_16_ddraw="no" | 103 | want_evas_engine_software_16_ddraw="no" |
@@ -244,10 +243,24 @@ case "$host_os" in | |||
244 | ;; | 243 | ;; |
245 | esac | 244 | esac |
246 | 245 | ||
246 | ### Checks for portability layer | ||
247 | |||
248 | PKG_CHECK_MODULES([EXOTIC], | ||
249 | [exotic], | ||
250 | [enable_exotic="yes"], | ||
251 | [enable_exotic="no"]) | ||
252 | |||
253 | if test "x${enable_exotic}" = "xyes"; then | ||
254 | requirement_evas="exotic ${requirement_evas}" | ||
255 | |||
256 | AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.]) | ||
257 | fi | ||
258 | AM_CONDITIONAL([EVAS_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"]) | ||
259 | |||
247 | ## strong dependencies | 260 | ## strong dependencies |
248 | 261 | ||
249 | # Eina | 262 | # Eina |
250 | PKG_CHECK_MODULES([EINA], [eina >= 1.1.0]) | 263 | PKG_CHECK_MODULES([EINA], [eina >= 1.2.0]) |
251 | CPPFLAGS_SAVE="$CPPFLAGS" | 264 | CPPFLAGS_SAVE="$CPPFLAGS" |
252 | CPPFLAGS="$CPPFLAGS $EINA_CFLAGS" | 265 | CPPFLAGS="$CPPFLAGS $EINA_CFLAGS" |
253 | AC_CHECK_SIZEOF(Eina_Unicode,, [#include <Eina.h>]) | 266 | AC_CHECK_SIZEOF(Eina_Unicode,, [#include <Eina.h>]) |
@@ -256,7 +269,7 @@ CPPFLAGS="$CPPFLAGS_SAVE" | |||
256 | # Freetype | 269 | # Freetype |
257 | PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.3.0]) | 270 | PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.3.0]) |
258 | 271 | ||
259 | requirement_evas="freetype2 eina >= 1.1.0 ${requirement_evas}" | 272 | requirement_evas="freetype2 eina >= 1.2.0 ${requirement_evas}" |
260 | 273 | ||
261 | ## optional dependencies | 274 | ## optional dependencies |
262 | 275 | ||
@@ -517,20 +530,6 @@ EFL_ATTRIBUTE_UNUSED | |||
517 | EFL_ATTRIBUTE_VECTOR | 530 | EFL_ATTRIBUTE_VECTOR |
518 | EFL_ATTRIBUTE_ALWAYS_INLINE | 531 | EFL_ATTRIBUTE_ALWAYS_INLINE |
519 | 532 | ||
520 | WIN32_CPPFLAGS="" | ||
521 | case "$host_os" in | ||
522 | mingw32ce*) | ||
523 | WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420" | ||
524 | ;; | ||
525 | mingw*) | ||
526 | WIN32_CPPFLAGS="-D_WIN32_WINNT=0x0500" | ||
527 | ;; | ||
528 | esac | ||
529 | AC_SUBST(WIN32_CPPFLAGS) | ||
530 | |||
531 | WIN32_CFLAGS="" | ||
532 | AC_SUBST(WIN32_CFLAGS) | ||
533 | |||
534 | 533 | ||
535 | ### Checks for linker characteristics | 534 | ### Checks for linker characteristics |
536 | lt_enable_auto_import="" | 535 | lt_enable_auto_import="" |
@@ -663,7 +662,7 @@ AM_CONDITIONAL([EVAS_CSERVE], [test "x${want_evas_cserve}" = "xyes"]) | |||
663 | gl_flavor_gles="no" | 662 | gl_flavor_gles="no" |
664 | AC_MSG_CHECKING(whether to build GLES flavor of GL) | 663 | AC_MSG_CHECKING(whether to build GLES flavor of GL) |
665 | AC_ARG_ENABLE(gl-flavor-gles, | 664 | AC_ARG_ENABLE(gl-flavor-gles, |
666 | AC_HELP_STRING([--enable-gl-flavor-gles], [enable gles falvor of gl instead of standard]), | 665 | AC_HELP_STRING([--enable-gl-flavor-gles], [enable gles flavor of gl instead of standard]), |
667 | [ | 666 | [ |
668 | if test "x$enableval" = "xyes" ; then | 667 | if test "x$enableval" = "xyes" ; then |
669 | AC_MSG_RESULT(yes) | 668 | AC_MSG_RESULT(yes) |
@@ -748,8 +747,6 @@ EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], | |||
748 | 747 | ||
749 | EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D]) | 748 | EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D]) |
750 | 749 | ||
751 | EVAS_CHECK_ENGINE([software-sdl], [${want_evas_engine_software_sdl}], [no], [Software SDL]) | ||
752 | |||
753 | EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT]) | 750 | EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT]) |
754 | 751 | ||
755 | EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL]) | 752 | EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL]) |
@@ -1854,8 +1851,8 @@ AM_CONDITIONAL([BUILD_EXAMPLES], [test "x${build_examples}" = "xyes"]) | |||
1854 | EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"]) | 1851 | EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"]) |
1855 | 1852 | ||
1856 | EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"]) | 1853 | EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"]) |
1857 | EVAS_CFLAGS="${EVAS_CFLAGS} ${EFL_COVERAGE_CFLAGS}" | 1854 | EVAS_CFLAGS="${EVAS_CFLAGS} ${EFL_COVERAGE_CFLAGS} ${EXOTIC_CFLAGS}" |
1858 | EVAS_LIBS="${EVAS_LIBS} ${EFL_COVERAGE_LIBS}" | 1855 | EVAS_LIBS="${EVAS_LIBS} ${EFL_COVERAGE_LIBS} ${EXOTIC_LIBS}" |
1859 | if test "x$enable_coverage" = "xyes" ; then | 1856 | if test "x$enable_coverage" = "xyes" ; then |
1860 | EVAS_CFLAGS="${EVAS_CFLAGS} ${EFL_DEBUG_CFLAGS}" | 1857 | EVAS_CFLAGS="${EVAS_CFLAGS} ${EFL_DEBUG_CFLAGS}" |
1861 | fi | 1858 | fi |
@@ -1932,7 +1929,6 @@ src/modules/engines/gl_x11/Makefile | |||
1932 | src/modules/engines/gl_sdl/Makefile | 1929 | src/modules/engines/gl_sdl/Makefile |
1933 | src/modules/engines/gl_cocoa/Makefile | 1930 | src/modules/engines/gl_cocoa/Makefile |
1934 | src/modules/engines/psl1ght/Makefile | 1931 | src/modules/engines/psl1ght/Makefile |
1935 | src/modules/engines/software_sdl/Makefile | ||
1936 | src/modules/engines/software_8/Makefile | 1932 | src/modules/engines/software_8/Makefile |
1937 | src/modules/engines/software_8_x11/Makefile | 1933 | src/modules/engines/software_8_x11/Makefile |
1938 | src/modules/engines/software_16/Makefile | 1934 | src/modules/engines/software_16/Makefile |
@@ -2019,8 +2015,7 @@ fi | |||
2019 | echo " Software GDI...............: $have_evas_engine_software_gdi" | 2015 | echo " Software GDI...............: $have_evas_engine_software_gdi" |
2020 | echo " Software DirectDraw........: $have_evas_engine_software_ddraw" | 2016 | echo " Software DirectDraw........: $have_evas_engine_software_ddraw" |
2021 | echo " Direct3d...................: $have_evas_engine_direct3d" | 2017 | echo " Direct3d...................: $have_evas_engine_direct3d" |
2022 | echo " Software SDL...............: $have_evas_engine_software_sdl (primitive: $sdl_primitive)" | 2018 | echo " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C" |
2023 | echo $ECHO_N " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C" | ||
2024 | if test "x$have_evas_engine_gl_sdl" = "xyes"; then | 2019 | if test "x$have_evas_engine_gl_sdl" = "xyes"; then |
2025 | echo "(GLES: $gl_flavor_gles) (SGX: $gles_variety_sgx) (s3c6410: $gles_variety_s3c6410)" | 2020 | echo "(GLES: $gl_flavor_gles) (SGX: $gles_variety_sgx) (s3c6410: $gles_variety_s3c6410)" |
2026 | else | 2021 | else |