summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-05 23:48:30 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-05 23:48:30 +0000
commite47bd2a9a5db6878dbdb0162451ecacde9824a9e (patch)
tree8455b032180b4124c887b33c821d4975bb950dc5 /configure.ac
parente1f16731efe07563f0b157a53890016ddcae2647 (diff)
merge: evas
* remove magic debug output in evas part * always use version for pc file, it's actually safe * fix compilation of gl-sdl * avoid circular dependency of libevas on itself SVN revision: 78935
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac15
1 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 755e0673a9..62c270bef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1248,7 +1248,7 @@ requirements_pc_evas="eo >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >=
1248PKG_CHECK_EXISTS([freetype2 >= 9.3.0], 1248PKG_CHECK_EXISTS([freetype2 >= 9.3.0],
1249 [requirements_pc_evas="freetype2 >= 9.3.0 ${requirements_pc_evas}"]) 1249 [requirements_pc_evas="freetype2 >= 9.3.0 ${requirements_pc_evas}"])
1250 1250
1251requirements_pc_deps_evas="freetype2 ${requirements_pc_deps_evas}" 1251requirements_pc_deps_evas="freetype2 >= 9.3.0 ${requirements_pc_deps_evas}"
1252 1252
1253## optional dependencies 1253## optional dependencies
1254 1254
@@ -1259,8 +1259,8 @@ if test "x${want_fontconfig}" = "xyes"; then
1259 [ 1259 [
1260 have_fontconfig="yes" 1260 have_fontconfig="yes"
1261 AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig searching capabilities]) 1261 AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig searching capabilities])
1262 requirements_pc_evas="fontconfig ${requirements_pc_evas}" 1262 requirements_pc_evas="fontconfig >= 2.5.0 ${requirements_pc_evas}"
1263 requirements_pc_deps_evas="fontconfig ${requirements_pc_deps_evas}" 1263 requirements_pc_deps_evas="fontconfig >= 2.5.0 ${requirements_pc_deps_evas}"
1264 ]) 1264 ])
1265fi 1265fi
1266 1266
@@ -1271,8 +1271,8 @@ if test "x${want_fribidi}" = "xyes"; then
1271 [ 1271 [
1272 have_fribidi="yes" 1272 have_fribidi="yes"
1273 AC_DEFINE([HAVE_FRIBIDI], [1], [have fribidi support]) 1273 AC_DEFINE([HAVE_FRIBIDI], [1], [have fribidi support])
1274 requirements_pc_evas="fribidi ${requirements_pc_evas}" 1274 requirements_pc_evas="fribidi >= 0.19.2 ${requirements_pc_evas}"
1275 requirements_pc_deps_evas="fribidi ${requirements_pc_deps_evas}" 1275 requirements_pc_deps_evas="fribidi >= 0.19.2 ${requirements_pc_deps_evas}"
1276 CPPFLAGS_SAVE="$CPPFLAGS" 1276 CPPFLAGS_SAVE="$CPPFLAGS"
1277 CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS" 1277 CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS"
1278 AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi/fribidi.h>]) 1278 AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi/fribidi.h>])
@@ -1287,8 +1287,8 @@ if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
1287 PKG_CHECK_EXISTS([harfbuzz >= 0.9.0], 1287 PKG_CHECK_EXISTS([harfbuzz >= 0.9.0],
1288 [ 1288 [
1289 have_harfbuzz="yes" 1289 have_harfbuzz="yes"
1290 requirements_pc_evas="harfbuzz ${requirements_pc_evas}" 1290 requirements_pc_evas="harfbuzz >= 0.9.0 ${requirements_pc_evas}"
1291 requirements_pc_deps_evas="harfbuzz ${requirements_pc_deps_evas}" 1291 requirements_pc_deps_evas="harfbuzz >= 0.9.0 ${requirements_pc_deps_evas}"
1292 ], 1292 ],
1293 [ 1293 [
1294 if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then 1294 if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
@@ -1927,7 +1927,6 @@ echo " ALTIVEC.................: $build_cpu_altivec"
1927echo " NEON....................: $build_cpu_neon" 1927echo " NEON....................: $build_cpu_neon"
1928echo 1928echo
1929echo " Features:" 1929echo " Features:"
1930echo " MAGIC_DEBUG.............: $want_evas_magic_debug"
1931echo " Cache Server 2..........: $want_evas_cserve2" 1930echo " Cache Server 2..........: $want_evas_cserve2"
1932echo " Threaded Pipe Rendering.: $build_pipe_render" 1931echo " Threaded Pipe Rendering.: $build_pipe_render"
1933echo 1932echo