diff options
author | Ryuan Choi <ryuan.choi@gmail.com> | 2014-07-05 01:43:43 +0900 |
---|---|---|
committer | Ryuan Choi <ryuan.choi@gmail.com> | 2014-07-05 01:43:43 +0900 |
commit | afb1d4a1e7f13bfbd1c7862b03b04b62b4c2d918 (patch) | |
tree | dc0bbbd577442304d007bfde97119e138aab5dee /configure.ac | |
parent | 304a922778ef1bf53538742408ba7280087877dc (diff) |
elm_web: Drop ewebkit backend (ewebkit2 is only available from now)
ewebkit was dropped from webkit.org
(https://bugs.webkit.org/show_bug.cgi?id=134087)
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 580e86c81..a3948e7f5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -494,27 +494,25 @@ if test "x$want_elementary_emap" = "xyes" -a "x$have_elementary_emap" = "xno"; t | |||
494 | fi | 494 | fi |
495 | AC_SUBST(ELM_EMAP_DEF) | 495 | AC_SUBST(ELM_EMAP_DEF) |
496 | 496 | ||
497 | ELM_WEB_DEF="#undef" | ||
498 | ELM_WEB2_DEF="#undef" | 497 | ELM_WEB2_DEF="#undef" |
499 | 498 | ||
500 | elementary_web_backend="detect" | 499 | elementary_web_backend="detect" |
501 | elementary_web="no" | 500 | elementary_web="no" |
502 | want_elementary_web="" | 501 | want_elementary_web="" |
503 | AC_ARG_WITH([elementary-web-backend], | 502 | AC_ARG_WITH([elementary-web-backend], |
504 | [AC_HELP_STRING([--with-elementary-web-backend=@<:@ewebkit/ewebkit2/detect/none@:>@], [Select the WebKit backend for Elementary to support web @<:@default=detect@:>@])], | 503 | [AC_HELP_STRING([--with-elementary-web-backend=@<:@ewebkit2/detect/none@:>@], [Select the WebKit backend for Elementary to support web @<:@default=detect@:>@])], |
505 | [ | 504 | [ |
506 | elementary_web_backend=${withval} | 505 | elementary_web_backend=${withval} |
507 | ], | 506 | ], |
508 | [elementary_web_backend="detect"]) | 507 | [elementary_web_backend="detect"]) |
509 | 508 | ||
510 | case "$elementary_web_backend" in | 509 | case "$elementary_web_backend" in |
511 | ewebkit|ewebkit2|detect|none) ;; | 510 | ewebkit2|detect|none) ;; |
512 | *) AC_MSG_ERROR([Invalid web backend: must be ewebkit, ewebkit2, detect or none]) ;; | 511 | *) AC_MSG_ERROR([Invalid web backend: must be ewebkit2, detect or none]) ;; |
513 | esac | 512 | esac |
514 | 513 | ||
515 | if test "x$elementary_web_backend" = "xdetect"; then | 514 | if test "x$elementary_web_backend" = "xdetect"; then |
516 | # FIXME : detect option should check both ewebkit and ewebkit2. | 515 | want_elementary_web="ewebkit2" |
517 | want_elementary_web="ewebkit" | ||
518 | else | 516 | else |
519 | want_elementary_web=$elementary_web_backend | 517 | want_elementary_web=$elementary_web_backend |
520 | fi | 518 | fi |
@@ -528,12 +526,7 @@ if test "x$want_elementary_web" != "xnone"; then | |||
528 | AC_DEFINE_UNQUOTED(WEBKIT_DATADIR, | 526 | AC_DEFINE_UNQUOTED(WEBKIT_DATADIR, |
529 | "$webkit_datadir", | 527 | "$webkit_datadir", |
530 | "WebKit's data dir") | 528 | "WebKit's data dir") |
531 | if test "x$elementary_web_backend" = "xewebkit2"; then | 529 | ELM_WEB2_DEF="#define" |
532 | AC_DEFINE(USE_WEBKIT2, 1, [Use ewebkit2 as Elementary web backend]) | ||
533 | ELM_WEB2_DEF="#define" | ||
534 | else | ||
535 | ELM_WEB_DEF="#define" | ||
536 | fi | ||
537 | 530 | ||
538 | elementary_web=$want_elementary_web | 531 | elementary_web=$want_elementary_web |
539 | requirement_elm="${want_elementary_web} ${requirement_elm}" | 532 | requirement_elm="${want_elementary_web} ${requirement_elm}" |
@@ -544,12 +537,11 @@ else | |||
544 | elementary_web="no" | 537 | elementary_web="no" |
545 | fi | 538 | fi |
546 | 539 | ||
547 | if test "x$elementary_web_backend" = "xewebkit" -o "x$elementary_web_backend" = "xewebkit2"; then | 540 | if test "x$elementary_web_backend" = "xewebkit2"; then |
548 | if test "x$elementary_web" = "xnone"; then | 541 | if test "x$elementary_web" = "xnone"; then |
549 | AC_MSG_ERROR([Web support requested, but no $elementary_web_backend found by pkg-config.]) | 542 | AC_MSG_ERROR([Web support requested, but no $elementary_web_backend found by pkg-config.]) |
550 | fi | 543 | fi |
551 | fi | 544 | fi |
552 | AC_SUBST(ELM_WEB_DEF) | ||
553 | AC_SUBST(ELM_WEB2_DEF) | 545 | AC_SUBST(ELM_WEB2_DEF) |
554 | 546 | ||
555 | ELM_DEBUG_DEF="#undef" | 547 | ELM_DEBUG_DEF="#undef" |