summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-10-19 03:08:45 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-10-19 03:08:45 +0000
commit3223c80c060d1f338e5344e8f6fa1bf55d22a0f7 (patch)
tree5d709c4567618bd6a979c0da03c61f1d7f541ac8 /configure.ac
parent0b76f011cd269c5dfc9b896f62a2d9c739440b41 (diff)
elementary: starting work for using WebKit2 as an alternative to WebKit.
Patch by ryuan Choi <ryuan.choi@gmail.com> SVN revision: 78219
Diffstat (limited to '')
-rw-r--r--configure.ac59
1 files changed, 39 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index a4d6cc6d4..cf31246ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -614,37 +614,56 @@ fi
614AC_SUBST(ELM_ETHUMB_DEF) 614AC_SUBST(ELM_ETHUMB_DEF)
615 615
616ELM_WEB_DEF="#undef" 616ELM_WEB_DEF="#undef"
617have_elementary_web="no"
618want_elementary_web="auto"
619AC_ARG_ENABLE([web],
620 [AC_HELP_STRING([--disable-web], [disable web (WebKit) support. @<:@default=detect@:>@])],
621 [want_elementary_web=$enableval], [])
622 617
623if test "x$want_elementary_web" != "xno"; then 618elementary_web_backend="detect"
619elementary_web="none"
620want_elementary_web=""
621AC_ARG_WITH([elementary-web-backend],
622 [AC_HELP_STRING([--with-elementary-web-backend=@<:@ewebkit/ewebkit2/detect/none@:>@], [Select the WebKit backend for Elementary to support web @<:@default=detect@:>@])],
623 [
624 elementary_web_backend=${withval}
625 ],
626 [elementary_web_backend="detect"])
627
628case "$elementary_web_backend" in
629 ewebkit|ewebkit2|detect|none) ;;
630 *) AC_MSG_ERROR([Invalid web backend: must be ewebkit, ewebkit2, detect or none]) ;;
631esac
632
633if test "x$elementary_web_backend" = "xdetect"; then
634 # FIXME : detect option should check both ewebkit and ewebkit2.
635 want_elementary_web="ewebkit"
636else
637 want_elementary_web=$elementary_web_backend
638fi
639
640if test "x$want_elementary_web" != "xnone"; then
624 PKG_CHECK_MODULES([ELEMENTARY_WEB], 641 PKG_CHECK_MODULES([ELEMENTARY_WEB],
625 [ 642 [$want_elementary_web],
626 ewebkit
627 ],
628 [ 643 [
629 AC_DEFINE(HAVE_ELEMENTARY_WEB, 1, [Web support for Elementary]) 644 AC_DEFINE(HAVE_ELEMENTARY_WEB, 1, [Web support for Elementary])
630 webkit_datadir=$($PKG_CONFIG ewebkit --variable=datadir) 645 webkit_datadir=$($PKG_CONFIG $want_elementary_web --variable=datadir)
631 AC_DEFINE_UNQUOTED(WEBKIT_DATADIR, 646 AC_DEFINE_UNQUOTED(WEBKIT_DATADIR,
632 "$webkit_datadir", 647 "$webkit_datadir",
633 "WebKit's data dir") 648 "WebKit's data dir")
634 have_elementary_web="yes" 649 if test "x$elementary_web_backend" = "xewebkit2"; then
650 AC_DEFINE(USE_WEBKIT2, 1, [Use ewebkit2 as Elementary web backend])
651 fi
652
653 elementary_web=$want_elementary_web
635 ELM_WEB_DEF="#define" 654 ELM_WEB_DEF="#define"
636## web_client? how about ewebkit? at least in current upstreak webkit 655 requirement_elm="${want_elementary_web} ${requirement_elm}"
637## there is no web_client.pc
638# requirement_elm="web_client ${requirement_elm}"
639 requirement_elm="ewebkit ${requirement_elm}"
640 ], 656 ],
641 [have_elementary_web="no"] 657 [elementary_web="none"]
642 ) 658 )
643else 659else
644 have_elementary_web="no" 660 elementary_web="none"
645fi 661fi
646if test "x$want_elementary_web" = "xyes" -a "x$have_elementary_web" = "xno"; then 662
647 AC_MSG_ERROR([Web support requested, but no ewebkit found by pkg-config.]) 663if test "x$elementary_web_backend" = "xewebkit" -o "x$elementary_web_backend" = "xewebkit2"; then
664 if test "x$elementary_web" = "xnone"; then
665 AC_MSG_ERROR([Web support requested, but no $elementary_web_backend found by pkg-config.])
666 fi
648fi 667fi
649AC_SUBST(ELM_WEB_DEF) 668AC_SUBST(ELM_WEB_DEF)
650 669
@@ -797,7 +816,7 @@ echo " EFreet.................: ${have_elementary_efreet}"
797echo " EWeather...............: ${have_elementary_eweather}" 816echo " EWeather...............: ${have_elementary_eweather}"
798echo " EMap...................: ${have_elementary_emap}" 817echo " EMap...................: ${have_elementary_emap}"
799echo " Ethumb.................: ${have_elementary_ethumb}" 818echo " Ethumb.................: ${have_elementary_ethumb}"
800echo " Web (WebKit)...........: ${have_elementary_web}" 819echo " Web (WebKit)...........: ${elementary_web}"
801echo " Quick Launch...........: ${have_fork}" 820echo " Quick Launch...........: ${have_fork}"
802echo " EIO....................: ${have_eio}" 821echo " EIO....................: ${have_eio}"
803echo " Emotion................: ${have_emotion}" 822echo " Emotion................: ${have_emotion}"