summaryrefslogtreecommitdiff
path: root/m4/evas_check_loader.m4
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 /m4/evas_check_loader.m4
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 'm4/evas_check_loader.m4')
-rw-r--r--m4/evas_check_loader.m421
1 files changed, 7 insertions, 14 deletions
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 1f2ebf2261..9a6470911f 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -181,7 +181,6 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
181[ 181[
182 182
183requirement="" 183requirement=""
184requirement_version=""
185have_dep="no" 184have_dep="no"
186evas_image_loader_[]$1[]_cflags="" 185evas_image_loader_[]$1[]_cflags=""
187evas_image_loader_[]$1[]_libs="" 186evas_image_loader_[]$1[]_libs=""
@@ -191,8 +190,7 @@ dnl We check it first.
191PKG_CHECK_EXISTS([libpng >= 1.2.10], 190PKG_CHECK_EXISTS([libpng >= 1.2.10],
192 [ 191 [
193 have_dep="yes" 192 have_dep="yes"
194 requirement="libpng" 193 requirement="libpng >= 1.2.10"
195 requirement_version="libpng >= 1.2.10"
196 ], 194 ],
197 [have_dep="no"]) 195 [have_dep="no"])
198 196
@@ -201,7 +199,6 @@ if test "x${have_dep}" = "xno" ; then
201 [ 199 [
202 have_dep="yes" 200 have_dep="yes"
203 requirement="libpng15" 201 requirement="libpng15"
204 requirement_version="libpng15"
205 ], 202 ],
206 [have_dep="no"]) 203 [have_dep="no"])
207fi 204fi
@@ -211,7 +208,6 @@ if test "x${have_dep}" = "xno" ; then
211 [ 208 [
212 have_dep="yes" 209 have_dep="yes"
213 requirement="libpng14" 210 requirement="libpng14"
214 requirement_version="libpng14"
215 ], 211 ],
216 [have_dep="no"]) 212 [have_dep="no"])
217fi 213fi
@@ -220,18 +216,17 @@ if test "x${have_dep}" = "xno" ; then
220 PKG_CHECK_EXISTS([libpng12 >= 1.2.10], 216 PKG_CHECK_EXISTS([libpng12 >= 1.2.10],
221 [ 217 [
222 have_dep="yes" 218 have_dep="yes"
223 requirement="libpng12" 219 requirement="libpng12 >= 1.2.10"
224 requirement_version="libpng12"
225 ], 220 ],
226 [have_dep="no"]) 221 [have_dep="no"])
227fi 222fi
228 223
229if test "x${have_dep}" = "xyes" ; then 224if test "x${have_dep}" = "xyes" ; then
230 if test "x$2" = "xstatic" ; then 225 if test "x$2" = "xstatic" ; then
231 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}" 226 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
232 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 227 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
233 else 228 else
234 PKG_CHECK_MODULES([PNG], [${requirement_version}]) 229 PKG_CHECK_MODULES([PNG], [${requirement}])
235 evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}" 230 evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
236 evas_image_loader_[]$1[]_libs="${PNG_LIBS}" 231 evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
237 fi 232 fi
@@ -266,7 +261,6 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
266[ 261[
267 262
268requirement="" 263requirement=""
269requirement_version=""
270evas_image_loader_[]$1[]_cflags="" 264evas_image_loader_[]$1[]_cflags=""
271evas_image_loader_[]$1[]_libs="" 265evas_image_loader_[]$1[]_libs=""
272version_esvg="0.0.18" 266version_esvg="0.0.18"
@@ -275,17 +269,16 @@ version_ender="0.0.6"
275PKG_CHECK_EXISTS([esvg >= ${version_esvg} ender >= ${version_ender}], 269PKG_CHECK_EXISTS([esvg >= ${version_esvg} ender >= ${version_ender}],
276 [ 270 [
277 have_dep="yes" 271 have_dep="yes"
278 requirement="esvg ender" 272 requirement="esvg ender >= ${version_esvg} ender >= ${version_ender}"
279 requirement_version="esvg >= ${version_esvg} ender >= ${version_ender}"
280 ], 273 ],
281 [have_dep="no"]) 274 [have_dep="no"])
282 275
283if test "x${have_dep}" = "xyes" ; then 276if test "x${have_dep}" = "xyes" ; then
284 if test "x$2" = "xstatic" ; then 277 if test "x$2" = "xstatic" ; then
285 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}" 278 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
286 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 279 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
287 else 280 else
288 PKG_CHECK_MODULES([SVG], [${requirement_version}]) 281 PKG_CHECK_MODULES([SVG], [${requirement}])
289 evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}" 282 evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
290 evas_image_loader_[]$1[]_libs="${SVG_LIBS}" 283 evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
291 fi 284 fi