From 01c03642a22badde8145ac7a41014e1097c1f4f0 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 22 Oct 2011 19:39:56 +0000 Subject: [PATCH] Evas: bump libpng version to 1.2.10. libpng 1.2.8 does not have the symbol png_set_expand_gray_1_2_4_to_8. It seems that 1.2.10 has no problem, so we check for libpng >= 1.2.10 and we drop libpng 1.0.* SVN revision: 64303 --- legacy/evas/m4/evas_check_loader.m4 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/legacy/evas/m4/evas_check_loader.m4 b/legacy/evas/m4/evas_check_loader.m4 index 0cb3d7b32a..989cd74767 100644 --- a/legacy/evas/m4/evas_check_loader.m4 +++ b/legacy/evas/m4/evas_check_loader.m4 @@ -179,7 +179,7 @@ evas_image_loader_[]$1[]_libs="" dnl libpng.pc is the latest version of libpng that ahs been installed. dnl We check it first. PKG_CHECK_MODULES([PNG], - [libpng], + [libpng >= 1.2.10], [have_dep="yes" requirement="libpng"], [have_dep="no"]) @@ -199,18 +199,11 @@ fi if test "x${have_dep}" = "xno" ; then PKG_CHECK_MODULES([PNG], - [libpng12], + [libpng12 >= 1.2.10], [have_dep="yes" requirement="libpng12"], [have_dep="no"]) fi -if test "x${have_dep}" = "xno" ; then - PKG_CHECK_MODULES([PNG], - [libpng10], - [have_dep="yes" requirement="libpng10"], - [have_dep="no"]) -fi - evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}" evas_image_loader_[]$1[]_libs="${PNG_LIBS}"