summaryrefslogtreecommitdiff
path: root/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
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')
-rw-r--r--m4/evas_check_engine.m440
-rw-r--r--m4/evas_check_loader.m421
2 files changed, 22 insertions, 39 deletions
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 7324cf9..d81829a 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -190,7 +190,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB],
190[ 190[
191 191
192requirement="" 192requirement=""
193requirement_version=""
194have_dep="no" 193have_dep="no"
195evas_engine_[]$1[]_cflags="" 194evas_engine_[]$1[]_cflags=""
196evas_engine_[]$1[]_libs="" 195evas_engine_[]$1[]_libs=""
@@ -198,17 +197,16 @@ evas_engine_[]$1[]_libs=""
198PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1], 197PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
199 [ 198 [
200 have_dep="yes" 199 have_dep="yes"
201 requirement="xcb xcb-shm xcb-image pixman-1" 200 requirement="xcb xcb-shm xcb-image >= 0.2.1 pixman-1"
202 requirement_version="xcb xcb-shm xcb-image >= 0.2.1 pixman-1"
203 ], 201 ],
204 [have_dep="no"]) 202 [have_dep="no"])
205 203
206if test "x${have_dep}" = "xyes" ; then 204if test "x${have_dep}" = "xyes" ; then
207 if test "x$2" = "xstatic" ; then 205 if test "x$2" = "xstatic" ; then
208 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}" 206 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
209 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 207 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
210 else 208 else
211 PKG_CHECK_MODULES([XCB], [${requirement_version}]) 209 PKG_CHECK_MODULES([XCB], [${requirement}])
212 evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}" 210 evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
213 evas_image_loader_[]$1[]_libs="${XCB_LIBS}" 211 evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
214 fi 212 fi
@@ -228,7 +226,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
228[ 226[
229 227
230requirement="" 228requirement=""
231requirement_version=""
232have_dep="no" 229have_dep="no"
233evas_engine_[]$1[]_cflags="" 230evas_engine_[]$1[]_cflags=""
234evas_engine_[]$1[]_libs="" 231evas_engine_[]$1[]_libs=""
@@ -282,20 +279,19 @@ if test "x${have_dep}" = "xyes" ; then
282 AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib) 279 AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
283fi 280fi
284 281
285PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1], 282PKG_CHECK_EXISTS([x11-xcb xcb xcb-glx xcb-render xcb-renderutil],
286 [ 283 [
287 have_dep="yes" 284 have_dep="yes"
288 requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 285 requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
289 requirement_version="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
290 ], 286 ],
291 [have_dep="no"]) 287 [have_dep="no"])
292 288
293if test "x${have_dep}" = "xyes" ; then 289if test "x${have_dep}" = "xyes" ; then
294 if test "x$2" = "xstatic" ; then 290 if test "x$2" = "xstatic" ; then
295 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}" 291 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
296 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 292 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
297 else 293 else
298 PKG_CHECK_MODULES([XCB_GL], [${requirement_version}]) 294 PKG_CHECK_MODULES([XCB_GL], [${requirement}])
299 evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}" 295 evas_image_loader_[]$1[]_cflags="${XCB_CFLAGS}"
300 evas_image_loader_[]$1[]_libs="${XCB_LIBS}" 296 evas_image_loader_[]$1[]_libs="${XCB_LIBS}"
301 fi 297 fi
@@ -499,7 +495,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_SDL],
499[ 495[
500 496
501requirement="" 497requirement=""
502requirement_version=""
503have_dep="no" 498have_dep="no"
504evas_engine_[]$1[]_cflags="" 499evas_engine_[]$1[]_cflags=""
505evas_engine_[]$1[]_libs="" 500evas_engine_[]$1[]_libs=""
@@ -507,17 +502,16 @@ evas_engine_[]$1[]_libs=""
507PKG_CHECK_EXISTS([sdl >= 1.2.0], 502PKG_CHECK_EXISTS([sdl >= 1.2.0],
508 [ 503 [
509 have_dep="yes" 504 have_dep="yes"
510 requirement="sdl" 505 requirement="sdl >= 1.2.0"
511 requirement_version="sdl >= 1.2.0"
512 ], 506 ],
513 [have_dep="no"]) 507 [have_dep="no"])
514 508
515if test "x${have_dep}" = "xyes" ; then 509if test "x${have_dep}" = "xyes" ; then
516 if test "x$2" = "xstatic" ; then 510 if test "x$2" = "xstatic" ; then
517 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}" 511 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
518 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 512 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
519 else 513 else
520 PKG_CHECK_MODULES([SDL], [${requirement_version}]) 514 PKG_CHECK_MODULES([SDL], [${requirement}])
521 evas_image_loader_[]$1[]_cflags="${SDL_CFLAGS}" 515 evas_image_loader_[]$1[]_cflags="${SDL_CFLAGS}"
522 evas_image_loader_[]$1[]_libs="${SDL_LIBS}" 516 evas_image_loader_[]$1[]_libs="${SDL_LIBS}"
523 fi 517 fi
@@ -618,7 +612,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECTFB],
618[ 612[
619 613
620requirement="" 614requirement=""
621requirement_version=""
622have_dep="no" 615have_dep="no"
623evas_engine_[]$1[]_cflags="" 616evas_engine_[]$1[]_cflags=""
624evas_engine_[]$1[]_libs="" 617evas_engine_[]$1[]_libs=""
@@ -626,17 +619,16 @@ evas_engine_[]$1[]_libs=""
626PKG_CHECK_EXISTS([directfb >= 0.9.16], 619PKG_CHECK_EXISTS([directfb >= 0.9.16],
627 [ 620 [
628 have_dep="yes" 621 have_dep="yes"
629 requirement="directfb" 622 requirement="directfb >= 0.9.16"
630 requirement_version="directfb >= 0.9.16"
631 ], 623 ],
632 [have_dep="no"]) 624 [have_dep="no"])
633 625
634if test "x${have_dep}" = "xyes" ; then 626if test "x${have_dep}" = "xyes" ; then
635 if test "x$2" = "xstatic" ; then 627 if test "x$2" = "xstatic" ; then
636 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}" 628 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
637 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 629 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
638 else 630 else
639 PKG_CHECK_MODULES([DIRECTFB], [${requirement_version}]) 631 PKG_CHECK_MODULES([DIRECTFB], [${requirement}])
640 evas_image_loader_[]$1[]_cflags="${DIRECTFB_CFLAGS}" 632 evas_image_loader_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
641 evas_image_loader_[]$1[]_libs="${DIRECTFB_LIBS}" 633 evas_image_loader_[]$1[]_libs="${DIRECTFB_LIBS}"
642 fi 634 fi
@@ -691,7 +683,6 @@ AC_DEFUN([EVAS_CHECK_ENGINE_DEP_WAYLAND_EGL],
691[ 683[
692 684
693requirement="" 685requirement=""
694requirement_version=""
695have_dep="no" 686have_dep="no"
696evas_engine_[]$1[]_cflags="" 687evas_engine_[]$1[]_cflags=""
697evas_engine_[]$1[]_libs="" 688evas_engine_[]$1[]_libs=""
@@ -705,17 +696,16 @@ fi
705PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library} wayland-client wayland-egl], 696PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library} wayland-client wayland-egl],
706 [ 697 [
707 have_dep="yes" 698 have_dep="yes"
708 requirement="egl ${gl_library} wayland-client wayland-egl" 699 requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
709 requirement_version="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
710 ], 700 ],
711 [have_dep="no"]) 701 [have_dep="no"])
712 702
713if test "x${have_dep}" = "xyes" ; then 703if test "x${have_dep}" = "xyes" ; then
714 if test "x$2" = "xstatic" ; then 704 if test "x$2" = "xstatic" ; then
715 requirements_pc_evas="${requirement_version} ${requirements_pc_evas}" 705 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
716 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" 706 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
717 else 707 else
718 PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement_version}]) 708 PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement}])
719 evas_image_loader_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" 709 evas_image_loader_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
720 evas_image_loader_[]$1[]_libs="${WAYLAND_EGL_LIBS}" 710 evas_image_loader_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
721 fi 711 fi
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 1f2ebf2..9a64709 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