summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-05 09:25:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-05 09:25:44 +0000
commit8091219f10a6e3ba0b46830109c3cf472fd1dfd8 (patch)
treef6087662068c3ebda54da25d2719e2af2db74c4b /m4
parent741703b11d5712356840a41ab66308987f1145cb (diff)
merge: evas fixes
* gl engines were checking for eet module, which does not exist when we install first the efl package. * fix pkgconfig values for static linking * add Evas output to configure SVN revision: 78918
Diffstat (limited to 'm4')
-rw-r--r--m4/evas_check_engine.m4280
-rw-r--r--m4/evas_check_loader.m4180
2 files changed, 181 insertions, 279 deletions
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 78c4acc..7324cf9 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -11,11 +11,7 @@ evas_engine_[]$1[]_libs=""
11AC_SUBST([evas_engine_$1_cflags]) 11AC_SUBST([evas_engine_$1_cflags])
12AC_SUBST([evas_engine_$1_libs]) 12AC_SUBST([evas_engine_$1_libs])
13 13
14if test "x${have_dep}" = "xyes" ; then 14AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
15 m4_default([$4], [:])
16else
17 m4_default([$5], [:])
18fi
19 15
20]) 16])
21 17
@@ -61,11 +57,7 @@ fi
61AC_SUBST([evas_engine_$1_cflags]) 57AC_SUBST([evas_engine_$1_cflags])
62AC_SUBST([evas_engine_$1_libs]) 58AC_SUBST([evas_engine_$1_libs])
63 59
64if test "x${have_dep}" = "xyes" ; then 60AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
65 m4_default([$4], [:])
66else
67 m4_default([$5], [:])
68fi
69 61
70]) 62])
71 63
@@ -136,19 +128,16 @@ if test "x${gl_flavor_gles}" = "xyes" ; then
136fi 128fi
137 129
138if test "x${have_dep}" = "xyes" ; then 130if test "x${have_dep}" = "xyes" ; then
139 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) 131 if test "x$2" = "xyes" ; then
140 if test "x${have_dep}" = "xyes" ; then 132 x_libs="${x_libs} -lX11 -lXext -lXrender"
141 if test "x$2" = "xyes" ; then 133 else
142 x_libs="${x_libs} -lX11 -lXext -lXrender" 134 x_dir=${x_dir:-/usr/X11R6}
143 else 135 x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
144 x_dir=${x_dir:-/usr/X11R6} 136 x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
145 x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} 137 fi
146 x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
147 fi
148 evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}" 138 evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}"
149 evas_engine_[]$1[]_libs="${x_libs} -lGL $gl_pt_lib" 139 evas_engine_[]$1[]_libs="${x_libs} -lGL $gl_pt_lib"
150 evas_engine_gl_common_libs="-lGL $gl_pt_lib" 140 evas_engine_gl_common_libs="-lGL $gl_pt_lib"
151 fi
152else 141else
153 if test "x$2" = "xyes" ; then 142 if test "x$2" = "xyes" ; then
154 x_libs="${x_libs} -lX11 -lXext -lXrender" 143 x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -172,21 +161,18 @@ else
172 ]) 161 ])
173 if test "x${have_egl}" = "xyes" ; then 162 if test "x${have_egl}" = "xyes" ; then
174 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) 163 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
175 if test "x${have_glesv2}" = "xyes" ; then 164 if test "x${have_dep}" = "xyes" ; then
176 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) 165 evas_engine_[]$1[]_cflags="${x_cflags}"
177 if test "x${have_dep}" = "xyes" ; then 166 evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
178 evas_engine_[]$1[]_cflags="${x_cflags}" 167 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
179 evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" 168 have_dep="yes"
180 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" 169 AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
181 have_dep="yes" 170 gles_variety_sgx="yes"
182 AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
183 gles_variety_sgx="yes"
184 fi
185 fi 171 fi
186 fi 172 fi
187fi 173fi
188 174
189if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 175if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
190 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 176 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
191 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" 177 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
192fi 178fi
@@ -194,12 +180,7 @@ fi
194AC_SUBST([evas_engine_$1_cflags]) 180AC_SUBST([evas_engine_$1_cflags])
195AC_SUBST([evas_engine_$1_libs]) 181AC_SUBST([evas_engine_$1_libs])
196 182
197 183AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
198if test "x${have_dep}" = "xyes" ; then
199 m4_default([$4], [:])
200else
201 m4_default([$5], [:])
202fi
203 184
204]) 185])
205 186
@@ -209,34 +190,34 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB],
209[ 190[
210 191
211requirement="" 192requirement=""
193requirement_version=""
212have_dep="no" 194have_dep="no"
213evas_engine_[]$1[]_cflags="" 195evas_engine_[]$1[]_cflags=""
214evas_engine_[]$1[]_libs="" 196evas_engine_[]$1[]_libs=""
215 197
216PKG_CHECK_MODULES([XCB], 198PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
217 [xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
218 [ 199 [
219 have_dep="yes" 200 have_dep="yes"
220 requirement="xcb xcb-shm xcb-image pixman-1" 201 requirement="xcb xcb-shm xcb-image pixman-1"
202 requirement_version="xcb xcb-shm xcb-image >= 0.2.1 pixman-1"
221 ], 203 ],
222 [have_dep="no"]) 204 [have_dep="no"])
223 205
224evas_engine_[]$1[]_cflags="${XCB_CFLAGS}" 206if test "x${have_dep}" = "xyes" ; then
225evas_engine_[]$1[]_libs="${XCB_LIBS}" 207 if test "x$2" = "xstatic" ; then
226 208 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
227if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 209 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
228 requirements_pc_evas="${requirement} ${requirements_pc_evas}" 210 else
229 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 211 PKG_CHECK_MODULES([XCB], [${requirement_version}])
212 evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
213 evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
214 fi
230fi 215fi
231 216
232AC_SUBST([evas_engine_$1_cflags]) 217AC_SUBST([evas_engine_$1_cflags])
233AC_SUBST([evas_engine_$1_libs]) 218AC_SUBST([evas_engine_$1_libs])
234 219
235if test "x${have_dep}" = "xyes" ; then 220AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
236 m4_default([$4], [:])
237else
238 m4_default([$5], [:])
239fi
240 221
241]) 222])
242 223
@@ -247,6 +228,7 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
247[ 228[
248 229
249requirement="" 230requirement=""
231requirement_version=""
250have_dep="no" 232have_dep="no"
251evas_engine_[]$1[]_cflags="" 233evas_engine_[]$1[]_cflags=""
252evas_engine_[]$1[]_libs="" 234evas_engine_[]$1[]_libs=""
@@ -300,14 +282,25 @@ if test "x${have_dep}" = "xyes" ; then
300 AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib) 282 AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
301fi 283fi
302 284
303PKG_CHECK_MODULES([XCB_GL], 285PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
304 [x11-xcb xcb xcb-glx xcb-render xcb-renderutil],
305 [ 286 [
306 have_dep="yes" 287 have_dep="yes"
307 requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 288 requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
289 requirement_version="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
308 ], 290 ],
309 [have_dep="no"]) 291 [have_dep="no"])
310 292
293if test "x${have_dep}" = "xyes" ; then
294 if test "x$2" = "xstatic" ; then
295 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
296 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
297 else
298 PKG_CHECK_MODULES([XCB_GL], [${requirement_version}])
299 evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
300 evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
301 fi
302fi
303
311evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}" 304evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}"
312evas_engine_[]$1[]_libs="${XCB_GL_LIBS}" 305evas_engine_[]$1[]_libs="${XCB_GL_LIBS}"
313 306
@@ -316,19 +309,16 @@ if test "x$gl_flavor_gles" = "xyes" ; then
316fi 309fi
317 310
318if test "x${have_dep}" = "xyes" ; then 311if test "x${have_dep}" = "xyes" ; then
319 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) 312 if test "x$2" = "xyes" ; then
320 if test "x${have_dep}" = "xyes" ; then 313 x_libs="${x_libs} -lX11 -lXext -lXrender"
321 if test "x$2" = "xyes" ; then 314 else
322 x_libs="${x_libs} -lX11 -lXext -lXrender" 315 x_dir=${x_dir:-/usr/X11R6}
323 else 316 x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
324 x_dir=${x_dir:-/usr/X11R6} 317 x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
325 x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} 318 fi
326 x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
327 fi
328 evas_engine_[]$1[]_cflags="-I/usr/include ${XCB_GL_CFLAGS} ${x_cflags}" 319 evas_engine_[]$1[]_cflags="-I/usr/include ${XCB_GL_CFLAGS} ${x_cflags}"
329 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGL $gl_pt_lib" 320 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGL $gl_pt_lib"
330 evas_engine_gl_common_libs="-lGL $gl_pt_lib" 321 evas_engine_gl_common_libs="-lGL $gl_pt_lib"
331 fi
332else 322else
333 if test "x$2" = "xyes" ; then 323 if test "x$2" = "xyes" ; then
334 x_libs="${x_libs} -lX11 -lXext -lXrender" 324 x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -347,16 +337,13 @@ else
347 ]) 337 ])
348 if test "x${have_egl}" = "xyes" ; then 338 if test "x${have_egl}" = "xyes" ; then
349 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) 339 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
350 if test "x${have_glesv2}" = "xyes" ; then 340 if test "x${have_dep}" = "xyes" ; then
351 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) 341 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
352 if test "x${have_dep}" = "xyes" ; then 342 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
353 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" 343 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
354 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" 344 have_dep="yes"
355 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" 345 AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
356 have_dep="yes" 346 gles_variety_sgx="yes"
357 AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
358 gles_variety_sgx="yes"
359 fi
360 fi 347 fi
361 fi 348 fi
362fi 349fi
@@ -371,11 +358,7 @@ fi
371AC_SUBST([evas_engine_$1_cflags]) 358AC_SUBST([evas_engine_$1_cflags])
372AC_SUBST([evas_engine_$1_libs]) 359AC_SUBST([evas_engine_$1_libs])
373 360
374if test "x${have_dep}" = "xyes" ; then 361AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
375 m4_default([$4], [:])
376else
377 m4_default([$5], [:])
378fi
379 362
380]) 363])
381 364
@@ -403,11 +386,7 @@ fi
403AC_SUBST([evas_engine_$1_cflags]) 386AC_SUBST([evas_engine_$1_cflags])
404AC_SUBST([evas_engine_$1_libs]) 387AC_SUBST([evas_engine_$1_libs])
405 388
406if test "x${have_dep}" = "xyes" ; then 389AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
407 m4_default([$4], [:])
408else
409 m4_default([$5], [:])
410fi
411 390
412]) 391])
413 392
@@ -426,7 +405,7 @@ AC_CHECK_HEADER([ddraw.h],
426 evas_engine_[]$1[]_libs="-lddraw" 405 evas_engine_[]$1[]_libs="-lddraw"
427 ]) 406 ])
428 407
429if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 408if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
430 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 409 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
431 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" 410 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
432fi 411fi
@@ -434,11 +413,7 @@ fi
434AC_SUBST([evas_engine_$1_cflags]) 413AC_SUBST([evas_engine_$1_cflags])
435AC_SUBST([evas_engine_$1_libs]) 414AC_SUBST([evas_engine_$1_libs])
436 415
437if test "x${have_dep}" = "xyes" ; then 416AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
438 m4_default([$4], [:])
439else
440 m4_default([$5], [:])
441fi
442 417
443]) 418])
444 419
@@ -465,11 +440,7 @@ fi
465AC_SUBST([evas_engine_$1_cflags]) 440AC_SUBST([evas_engine_$1_cflags])
466AC_SUBST([evas_engine_$1_libs]) 441AC_SUBST([evas_engine_$1_libs])
467 442
468if test "x${have_dep}" = "xyes" ; then 443AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
469 m4_default([$4], [:])
470else
471 m4_default([$5], [:])
472fi
473 444
474]) 445])
475 446
@@ -510,10 +481,6 @@ LIBS="$LIBS_save"
510 481
511AC_LANG_POP([Objective C]) 482AC_LANG_POP([Objective C])
512 483
513if test "x${have_dep}" = "xyes" ; then
514 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
515fi
516
517if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 484if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
518 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}" 485 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
519 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}" 486 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
@@ -522,11 +489,7 @@ fi
522AC_SUBST([evas_engine_$1_cflags]) 489AC_SUBST([evas_engine_$1_cflags])
523AC_SUBST([evas_engine_$1_libs]) 490AC_SUBST([evas_engine_$1_libs])
524 491
525if test "x${have_dep}" = "xyes" ; then 492AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
526 m4_default([$4], [:])
527else
528 m4_default([$5], [:])
529fi
530 493
531]) 494])
532 495
@@ -536,19 +499,29 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_SDL],
536[ 499[
537 500
538requirement="" 501requirement=""
502requirement_version=""
539have_dep="no" 503have_dep="no"
540evas_engine_[]$1[]_cflags="" 504evas_engine_[]$1[]_cflags=""
541evas_engine_[]$1[]_libs="" 505evas_engine_[]$1[]_libs=""
542 506
543PKG_CHECK_MODULES([SDL], 507PKG_CHECK_EXISTS([sdl >= 1.2.0],
544 [sdl >= 1.2.0],
545 [ 508 [
546 have_dep="yes" 509 have_dep="yes"
547 requirement="sdl" 510 requirement="sdl"
548 ]) 511 requirement_version="sdl >= 1.2.0"
512 ],
513 [have_dep="no"])
549 514
550evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" 515if test "x${have_dep}" = "xyes" ; then
551evas_engine_[]$1[]_libs="${SDL_LIBS}" 516 if test "x$2" = "xstatic" ; then
517 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
518 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
519 else
520 PKG_CHECK_MODULES([SDL], [${requirement_version}])
521 evas_image_loader_[]$1[]_cflags="${SDL_CFLAGS}"
522 evas_image_loader_[]$1[]_libs="${SDL_LIBS}"
523 fi
524fi
552 525
553gl_pt_lib=""; 526gl_pt_lib="";
554have_gl_pt="no" 527have_gl_pt="no"
@@ -588,8 +561,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then
588fi 561fi
589 562
590if test "x${have_dep}" = "xyes" ; then 563if test "x${have_dep}" = "xyes" ; then
591 evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" 564 evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGL -lm $gl_pt_lib"
592 evas_engine_[]$1[]_libs="${SDL_LIBS} -lGL -lm $gl_pt_lib"
593 evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib" 565 evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib"
594else 566else
595 AC_CHECK_HEADER([SDL/SDL_opengles.h], 567 AC_CHECK_HEADER([SDL/SDL_opengles.h],
@@ -602,8 +574,7 @@ else
602 if test "x${have_egl}" = "xyes" ; then 574 if test "x${have_egl}" = "xyes" ; then
603 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib) 575 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib)
604 if test "x${have_glesv2}" = "xyes" ; then 576 if test "x${have_glesv2}" = "xyes" ; then
605 evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" 577 evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
606 evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib"
607 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib" 578 evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
608 have_dep="yes" 579 have_dep="yes"
609 AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support]) 580 AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
@@ -612,13 +583,6 @@ else
612 fi 583 fi
613fi 584fi
614 585
615if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
616 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
617 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
618 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
619 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
620fi
621
622AC_SUBST([evas_engine_$1_cflags]) 586AC_SUBST([evas_engine_$1_cflags])
623AC_SUBST([evas_engine_$1_libs]) 587AC_SUBST([evas_engine_$1_libs])
624 588
@@ -626,11 +590,7 @@ if test "x$3" = "xstatic" ; then
626 requirement_evas="${requirement} ${requirement_evas}" 590 requirement_evas="${requirement} ${requirement_evas}"
627fi 591fi
628 592
629if test "x${have_dep}" = "xyes" ; then 593AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
630 m4_default([$4], [:])
631else
632 m4_default([$5], [:])
633fi
634 594
635]) 595])
636 596
@@ -648,11 +608,7 @@ AC_CHECK_HEADER([linux/fb.h], [have_dep="yes"])
648AC_SUBST([evas_engine_$1_cflags]) 608AC_SUBST([evas_engine_$1_cflags])
649AC_SUBST([evas_engine_$1_libs]) 609AC_SUBST([evas_engine_$1_libs])
650 610
651if test "x${have_dep}" = "xyes" ; then 611AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
652 m4_default([$4], [:])
653else
654 m4_default([$5], [:])
655fi
656 612
657]) 613])
658 614
@@ -662,32 +618,34 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECTFB],
662[ 618[
663 619
664requirement="" 620requirement=""
621requirement_version=""
665have_dep="no" 622have_dep="no"
666evas_engine_[]$1[]_cflags="" 623evas_engine_[]$1[]_cflags=""
667evas_engine_[]$1[]_libs="" 624evas_engine_[]$1[]_libs=""
668 625
669PKG_CHECK_MODULES([DIRECTFB], 626PKG_CHECK_EXISTS([directfb >= 0.9.16],
670 [directfb >= 0.9.16],
671 [ 627 [
672 have_dep="yes" 628 have_dep="yes"
673 requirement="directfb" 629 requirement="directfb"
674 evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}" 630 requirement_version="directfb >= 0.9.16"
675 evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}" 631 ],
676 ]) 632 [have_dep="no"])
677 633
678if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 634if test "x${have_dep}" = "xyes" ; then
679 requirements_pc_evas="${requirement} ${requirements_pc_evas}" 635 if test "x$2" = "xstatic" ; then
680 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 636 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
637 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
638 else
639 PKG_CHECK_MODULES([DIRECTFB], [${requirement_version}])
640 evas_image_loader_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
641 evas_image_loader_[]$1[]_libs="${DIRECTFB_LIBS}"
642 fi
681fi 643fi
682 644
683AC_SUBST([evas_engine_$1_cflags]) 645AC_SUBST([evas_engine_$1_cflags])
684AC_SUBST([evas_engine_$1_libs]) 646AC_SUBST([evas_engine_$1_libs])
685 647
686if test "x${have_dep}" = "xyes" ; then 648AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
687 m4_default([$4], [:])
688else
689 m4_default([$5], [:])
690fi
691 649
692]) 650])
693 651
@@ -705,11 +663,7 @@ AC_CHECK_HEADER([rsx/rsx.h], [have_dep="yes"])
705AC_SUBST([evas_engine_$1_cflags]) 663AC_SUBST([evas_engine_$1_cflags])
706AC_SUBST([evas_engine_$1_libs]) 664AC_SUBST([evas_engine_$1_libs])
707 665
708if test "x${have_dep}" = "xyes" ; then 666AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
709 m4_default([$4], [:])
710else
711 m4_default([$5], [:])
712fi
713 667
714]) 668])
715 669
@@ -726,11 +680,7 @@ evas_engine_[]$1[]_libs=""
726AC_SUBST([evas_engine_$1_cflags]) 680AC_SUBST([evas_engine_$1_cflags])
727AC_SUBST([evas_engine_$1_libs]) 681AC_SUBST([evas_engine_$1_libs])
728 682
729if test "x${have_dep}" = "xyes" ; then 683AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
730 m4_default([$4], [:])
731else
732 m4_default([$5], [:])
733fi
734 684
735]) 685])
736 686
@@ -741,6 +691,7 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_WAYLAND_EGL],
741[ 691[
742 692
743requirement="" 693requirement=""
694requirement_version=""
744have_dep="no" 695have_dep="no"
745evas_engine_[]$1[]_cflags="" 696evas_engine_[]$1[]_cflags=""
746evas_engine_[]$1[]_libs="" 697evas_engine_[]$1[]_libs=""
@@ -751,32 +702,29 @@ else
751 gl_library="gl" 702 gl_library="gl"
752fi 703fi
753 704
754PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"]) 705PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library} wayland-client wayland-egl],
755
756PKG_CHECK_MODULES([WAYLAND_EGL],
757 [egl >= 7.10 ${gl_library} wayland-client wayland-egl],
758 [ 706 [
759 have_dep="yes" 707 have_dep="yes"
760 requirement="egl ${gl_library} wayland-client wayland-egl" 708 requirement="egl ${gl_library} wayland-client wayland-egl"
709 requirement_version="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
761 ], 710 ],
762 [have_dep="no"]) 711 [have_dep="no"])
763 712
764evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" 713if test "x${have_dep}" = "xyes" ; then
765evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}" 714 if test "x$2" = "xstatic" ; then
766 715 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
767if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then 716 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
768 requirements_pc_evas="${requirement} ${requirements_pc_evas}" 717 else
769 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 718 PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement_version}])
719 evas_image_loader_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
720 evas_image_loader_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
721 fi
770fi 722fi
771 723
772AC_SUBST([evas_engine_$1_cflags]) 724AC_SUBST([evas_engine_$1_cflags])
773AC_SUBST([evas_engine_$1_libs]) 725AC_SUBST([evas_engine_$1_libs])
774 726
775if test "x${have_dep}" = "xyes" ; then 727AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
776 m4_default([$4], [:])
777else
778 m4_default([$5], [:])
779fi
780 728
781]) 729])
782 730
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 1b0831d..1f2ebf2 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -11,11 +11,7 @@ evas_image_loader_[]$1[]_libs=""
11AC_SUBST([evas_image_loader_$1_cflags]) 11AC_SUBST([evas_image_loader_$1_cflags])
12AC_SUBST([evas_image_loader_$1_libs]) 12AC_SUBST([evas_image_loader_$1_libs])
13 13
14if test "x${have_dep}" = "xyes" ; then 14AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
15 m4_default([$3], [:])
16else
17 m4_default([$4], [:])
18fi
19 15
20]) 16])
21 17
@@ -29,23 +25,13 @@ have_dep="no"
29evas_image_loader_[]$1[]_cflags="" 25evas_image_loader_[]$1[]_cflags=""
30evas_image_loader_[]$1[]_libs="" 26evas_image_loader_[]$1[]_libs=""
31 27
32PKG_CHECK_MODULES([EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes" requirement="eet >= ${PACKAGE_VERSION}"], [have_dep="no"]) 28dnl Eet is required
33evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}" 29have_dep="yes"
34evas_image_loader_[]$1[]_libs="${EET_LIBS}"
35 30
36AC_SUBST([evas_image_loader_$1_cflags]) 31AC_SUBST([evas_image_loader_$1_cflags])
37AC_SUBST([evas_image_loader_$1_libs]) 32AC_SUBST([evas_image_loader_$1_libs])
38 33
39if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then 34AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
40 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
41 requirements_pc_deps_evas="${requirements_pc_deps_evas}"
42fi
43
44if test "x${have_dep}" = "xyes" ; then
45 m4_default([$3], [:])
46else
47 m4_default([$4], [:])
48fi
49 35
50]) 36])
51 37
@@ -61,11 +47,7 @@ evas_image_loader_[]$1[]_libs=""
61AC_SUBST([evas_image_loader_$1_cflags]) 47AC_SUBST([evas_image_loader_$1_cflags])
62AC_SUBST([evas_image_loader_$1_libs]) 48AC_SUBST([evas_image_loader_$1_libs])
63 49
64if test "x${have_dep}" = "xyes" ; then 50AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
65 m4_default([$3], [:])
66else
67 m4_default([$4], [:])
68fi
69 51
70]) 52])
71 53
@@ -108,11 +90,7 @@ fi
108AC_SUBST([evas_image_loader_$1_cflags]) 90AC_SUBST([evas_image_loader_$1_cflags])
109AC_SUBST([evas_image_loader_$1_libs]) 91AC_SUBST([evas_image_loader_$1_libs])
110 92
111if test "x${have_dep}" = "xyes" ; then 93AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
112 m4_default([$3], [:])
113else
114 m4_default([$4], [:])
115fi
116 94
117]) 95])
118 96
@@ -128,11 +106,7 @@ evas_image_loader_[]$1[]_libs=""
128AC_SUBST([evas_image_loader_$1_cflags]) 106AC_SUBST([evas_image_loader_$1_cflags])
129AC_SUBST([evas_image_loader_$1_libs]) 107AC_SUBST([evas_image_loader_$1_libs])
130 108
131if test "x${have_dep}" = "xyes" ; then 109AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
132 m4_default([$3], [:])
133else
134 m4_default([$4], [:])
135fi
136 110
137]) 111])
138 112
@@ -181,11 +155,7 @@ fi
181AC_SUBST([evas_image_loader_$1_cflags]) 155AC_SUBST([evas_image_loader_$1_cflags])
182AC_SUBST([evas_image_loader_$1_libs]) 156AC_SUBST([evas_image_loader_$1_libs])
183 157
184if test "x${have_dep}" = "xyes" ; then 158AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
185 m4_default([$3], [:])
186else
187 m4_default([$4], [:])
188fi
189 159
190]) 160])
191 161
@@ -201,11 +171,7 @@ evas_image_loader_[]$1[]_libs=""
201AC_SUBST([evas_image_loader_$1_cflags]) 171AC_SUBST([evas_image_loader_$1_cflags])
202AC_SUBST([evas_image_loader_$1_libs]) 172AC_SUBST([evas_image_loader_$1_libs])
203 173
204if test "x${have_dep}" = "xyes" ; then 174AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
205 m4_default([$3], [:])
206else
207 m4_default([$4], [:])
208fi
209 175
210]) 176])
211 177
@@ -215,54 +181,66 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
215[ 181[
216 182
217requirement="" 183requirement=""
184requirement_version=""
218have_dep="no" 185have_dep="no"
219evas_image_loader_[]$1[]_cflags="" 186evas_image_loader_[]$1[]_cflags=""
220evas_image_loader_[]$1[]_libs="" 187evas_image_loader_[]$1[]_libs=""
221 188
222dnl libpng.pc is the latest version of libpng that ahs been installed. 189dnl libpng.pc is the latest version of libpng that ahs been installed.
223dnl We check it first. 190dnl We check it first.
224PKG_CHECK_MODULES([PNG], 191PKG_CHECK_EXISTS([libpng >= 1.2.10],
225 [libpng >= 1.2.10], 192 [
226 [have_dep="yes" requirement="libpng"], 193 have_dep="yes"
194 requirement="libpng"
195 requirement_version="libpng >= 1.2.10"
196 ],
227 [have_dep="no"]) 197 [have_dep="no"])
228 198
229if test "x${have_dep}" = "xno" ; then 199if test "x${have_dep}" = "xno" ; then
230 PKG_CHECK_MODULES([PNG], 200 PKG_CHECK_EXISTS([libpng15],
231 [libpng15], 201 [
232 [have_dep="yes" requirement="libpng15"], 202 have_dep="yes"
203 requirement="libpng15"
204 requirement_version="libpng15"
205 ],
233 [have_dep="no"]) 206 [have_dep="no"])
234fi 207fi
235 208
236if test "x${have_dep}" = "xno" ; then 209if test "x${have_dep}" = "xno" ; then
237 PKG_CHECK_MODULES([PNG], 210 PKG_CHECK_EXISTS([libpng14],
238 [libpng14], 211 [
239 [have_dep="yes" requirement="libpng14"], 212 have_dep="yes"
213 requirement="libpng14"
214 requirement_version="libpng14"
215 ],
240 [have_dep="no"]) 216 [have_dep="no"])
241fi 217fi
242 218
243if test "x${have_dep}" = "xno" ; then 219if test "x${have_dep}" = "xno" ; then
244 PKG_CHECK_MODULES([PNG], 220 PKG_CHECK_EXISTS([libpng12 >= 1.2.10],
245 [libpng12 >= 1.2.10], 221 [
246 [have_dep="yes" requirement="libpng12"], 222 have_dep="yes"
223 requirement="libpng12"
224 requirement_version="libpng12"
225 ],
247 [have_dep="no"]) 226 [have_dep="no"])
248fi 227fi
249 228
250evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}" 229if test "x${have_dep}" = "xyes" ; then
251evas_image_loader_[]$1[]_libs="${PNG_LIBS}" 230 if test "x$2" = "xstatic" ; then
231 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
232 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
233 else
234 PKG_CHECK_MODULES([PNG], [${requirement_version}])
235 evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
236 evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
237 fi
238fi
252 239
253AC_SUBST([evas_image_loader_$1_cflags]) 240AC_SUBST([evas_image_loader_$1_cflags])
254AC_SUBST([evas_image_loader_$1_libs]) 241AC_SUBST([evas_image_loader_$1_libs])
255 242
256if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then 243AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
257 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
258 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
259fi
260
261if test "x${have_dep}" = "xyes" ; then
262 m4_default([$3], [:])
263else
264 m4_default([$4], [:])
265fi
266 244
267]) 245])
268 246
@@ -278,11 +256,7 @@ evas_image_loader_[]$1[]_libs=""
278AC_SUBST([evas_image_loader_$1_cflags]) 256AC_SUBST([evas_image_loader_$1_cflags])
279AC_SUBST([evas_image_loader_$1_libs]) 257AC_SUBST([evas_image_loader_$1_libs])
280 258
281if test "x${have_dep}" = "xyes" ; then 259AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
282 m4_default([$3], [:])
283else
284 m4_default([$4], [:])
285fi
286 260
287]) 261])
288 262
@@ -292,35 +266,35 @@ AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
292[ 266[
293 267
294requirement="" 268requirement=""
295have_esvg="no" 269requirement_version=""
296evas_image_loader_[]$1[]_cflags="" 270evas_image_loader_[]$1[]_cflags=""
297evas_image_loader_[]$1[]_libs="" 271evas_image_loader_[]$1[]_libs=""
298version_esvg="0.0.18" 272version_esvg="0.0.18"
299version_ender="0.0.6" 273version_ender="0.0.6"
300 274
301PKG_CHECK_MODULES([SVG], 275PKG_CHECK_EXISTS([esvg >= ${version_esvg} ender >= ${version_ender}],
302 [esvg >= ${version_esvg} ender >= ${version_ender}], 276 [
303 [have_dep="yes" have_esvg="yes" requirement="esvg >= ${version_esvg} ender >= ${version_ender}"], 277 have_dep="yes"
278 requirement="esvg ender"
279 requirement_version="esvg >= ${version_esvg} ender >= ${version_ender}"
280 ],
304 [have_dep="no"]) 281 [have_dep="no"])
305 282
306if test "x${have_dep}" = "xyes" ; then 283if test "x${have_dep}" = "xyes" ; then
307 evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}" 284 if test "x$2" = "xstatic" ; then
308 evas_image_loader_[]$1[]_libs="${SVG_LIBS}" 285 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}"
286 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
287 else
288 PKG_CHECK_MODULES([SVG], [${requirement_version}])
289 evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
290 evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
291 fi
309fi 292fi
310 293
311AC_SUBST([evas_image_loader_$1_cflags]) 294AC_SUBST([evas_image_loader_$1_cflags])
312AC_SUBST([evas_image_loader_$1_libs]) 295AC_SUBST([evas_image_loader_$1_libs])
313 296
314if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then 297AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
315 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
316 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
317fi
318
319if test "x${have_dep}" = "xyes" ; then
320 m4_default([$3], [:])
321else
322 m4_default([$4], [:])
323fi
324 298
325]) 299])
326 300
@@ -336,11 +310,7 @@ evas_image_loader_[]$1[]_libs=""
336AC_SUBST([evas_image_loader_$1_cflags]) 310AC_SUBST([evas_image_loader_$1_cflags])
337AC_SUBST([evas_image_loader_$1_libs]) 311AC_SUBST([evas_image_loader_$1_libs])
338 312
339if test "x${have_dep}" = "xyes" ; then 313AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
340 m4_default([$3], [:])
341else
342 m4_default([$4], [:])
343fi
344 314
345]) 315])
346 316
@@ -393,11 +363,7 @@ fi
393AC_SUBST([evas_image_loader_$1_cflags]) 363AC_SUBST([evas_image_loader_$1_cflags])
394AC_SUBST([evas_image_loader_$1_libs]) 364AC_SUBST([evas_image_loader_$1_libs])
395 365
396if test "x${have_dep}" = "xyes" ; then 366AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
397 m4_default([$3], [:])
398else
399 m4_default([$4], [:])
400fi
401 367
402]) 368])
403 369
@@ -413,11 +379,7 @@ evas_image_loader_[]$1[]_libs=""
413AC_SUBST([evas_image_loader_$1_cflags]) 379AC_SUBST([evas_image_loader_$1_cflags])
414AC_SUBST([evas_image_loader_$1_libs]) 380AC_SUBST([evas_image_loader_$1_libs])
415 381
416if test "x${have_dep}" = "xyes" ; then 382AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
417 m4_default([$3], [:])
418else
419 m4_default([$4], [:])
420fi
421 383
422]) 384])
423 385
@@ -450,11 +412,7 @@ fi
450AC_SUBST([evas_image_loader_$1_cflags]) 412AC_SUBST([evas_image_loader_$1_cflags])
451AC_SUBST([evas_image_loader_$1_libs]) 413AC_SUBST([evas_image_loader_$1_libs])
452 414
453if test "x${have_dep}" = "xyes" ; then 415AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
454 m4_default([$3], [:])
455else
456 m4_default([$4], [:])
457fi
458 416
459]) 417])
460 418
@@ -470,11 +428,7 @@ evas_image_loader_[]$1[]_libs=""
470AC_SUBST([evas_image_loader_$1_cflags]) 428AC_SUBST([evas_image_loader_$1_cflags])
471AC_SUBST([evas_image_loader_$1_libs]) 429AC_SUBST([evas_image_loader_$1_libs])
472 430
473if test "x${have_dep}" = "xyes" ; then 431AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
474 m4_default([$3], [:])
475else
476 m4_default([$4], [:])
477fi
478 432
479]) 433])
480 434