summaryrefslogtreecommitdiff
path: root/legacy/evas/m4
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-10-22 19:39:56 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-10-22 19:39:56 +0000
commit01c03642a22badde8145ac7a41014e1097c1f4f0 (patch)
tree79dd713629521f03e3576a9bf330e921e7b9d7c3 /legacy/evas/m4
parent880a34d2a6e87ee55c56abbaf036c4a94a629945 (diff)
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
Diffstat (limited to 'legacy/evas/m4')
-rw-r--r--legacy/evas/m4/evas_check_loader.m411
1 files changed, 2 insertions, 9 deletions
diff --git a/legacy/evas/m4/evas_check_loader.m4 b/legacy/evas/m4/evas_check_loader.m4
index 0cb3d7b..989cd74 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=""
179dnl libpng.pc is the latest version of libpng that ahs been installed. 179dnl libpng.pc is the latest version of libpng that ahs been installed.
180dnl We check it first. 180dnl We check it first.
181PKG_CHECK_MODULES([PNG], 181PKG_CHECK_MODULES([PNG],
182 [libpng], 182 [libpng >= 1.2.10],
183 [have_dep="yes" requirement="libpng"], 183 [have_dep="yes" requirement="libpng"],
184 [have_dep="no"]) 184 [have_dep="no"])
185 185
@@ -199,18 +199,11 @@ fi
199 199
200if test "x${have_dep}" = "xno" ; then 200if test "x${have_dep}" = "xno" ; then
201 PKG_CHECK_MODULES([PNG], 201 PKG_CHECK_MODULES([PNG],
202 [libpng12], 202 [libpng12 >= 1.2.10],
203 [have_dep="yes" requirement="libpng12"], 203 [have_dep="yes" requirement="libpng12"],
204 [have_dep="no"]) 204 [have_dep="no"])
205fi 205fi
206 206
207if test "x${have_dep}" = "xno" ; then
208 PKG_CHECK_MODULES([PNG],
209 [libpng10],
210 [have_dep="yes" requirement="libpng10"],
211 [have_dep="no"])
212fi
213
214evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}" 207evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
215evas_image_loader_[]$1[]_libs="${PNG_LIBS}" 208evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
216 209