summaryrefslogtreecommitdiff
path: root/legacy/evas/m4/evas_check_engine.m4
diff options
context:
space:
mode:
authorMichael Jennings <mej@kainx.org>2011-01-29 01:29:21 +0000
committerMichael Jennings <mej@kainx.org>2011-01-29 01:29:21 +0000
commitdc3bd40b887bbe030dc5b409856341cbe79bbe4d (patch)
tree3efc8f774c6e4f0a28094ab195a903630f3584f2 /legacy/evas/m4/evas_check_engine.m4
parent0b03851c361d3034a3944d042a59f40920628adf (diff)
Portability fixes for autoconf. Please test and verify on
Debian/Ubuntu. Don't build GIF support by default. SVN revision: 56347
Diffstat (limited to '')
-rw-r--r--legacy/evas/m4/evas_check_engine.m420
1 files changed, 9 insertions, 11 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4
index 178355ff15..fdc2870490 100644
--- a/legacy/evas/m4/evas_check_engine.m4
+++ b/legacy/evas/m4/evas_check_engine.m4
@@ -435,16 +435,14 @@ AC_REQUIRE([EVAS_MAYBE_GET_OBJCPP])
435 435
436AS_IF([test "x${rw_cv_prog_objc_works}" = "xyes"], 436AS_IF([test "x${rw_cv_prog_objc_works}" = "xyes"],
437[ 437[
438 AC_LANG_PUSH([Objective C]) 438 m4_ifdef([AC_PROG_OBJC], [AC_LANG_PUSH([Objective C])])
439 AC_CHECK_HEADER([/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h], 439 AC_CHECK_HEADER([/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h], [
440 [ 440 have_dep="yes"
441 have_dep="yes" 441 evas_engine_[]$1[]_libs="-framework Cocoa"
442 evas_engine_[]$1[]_libs="-framework Cocoa" 442 ],[
443 ], 443 have_dep="no"
444 [have_dep="no"]) 444 ])
445 AC_LANG_POP([Objective C]) 445 m4_ifdef([AC_PROG_OBJC], [AC_LANG_POP([Objective C])], [:])])
446
447])
448 446
449AC_SUBST([evas_engine_$1_cflags]) 447AC_SUBST([evas_engine_$1_cflags])
450AC_SUBST([evas_engine_$1_libs]) 448AC_SUBST([evas_engine_$1_libs])
@@ -461,7 +459,7 @@ dnl Helper macro for EVAS_CHECK_ENGINE_DEP_QUARTZ
461 459
462AC_DEFUN([EVAS_MAYBE_GET_OBJCPP], 460AC_DEFUN([EVAS_MAYBE_GET_OBJCPP],
463[AS_IF([test "x${rw_cv_prog_objc_works}" = "xyes"], 461[AS_IF([test "x${rw_cv_prog_objc_works}" = "xyes"],
464 [AC_PROG_OBJCPP]) 462 [m4_ifdef([AC_PROG_OBJC], [AC_PROG_OBJCPP], [:])])
465]) 463])
466 464
467dnl use: EVAS_CHECK_ENGINE_DEP_GL_GLEW(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) 465dnl use: EVAS_CHECK_ENGINE_DEP_GL_GLEW(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])