summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac6
-rw-r--r--doc/widgets/Makefile.am1
-rw-r--r--src/edje_externals/Makefile.am1
-rw-r--r--src/lib/Elementary.h.in9
-rw-r--r--src/lib/elm_web.c1
-rw-r--r--src/lib/elm_web2.c1
6 files changed, 16 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1ffacde3c..2d082e15b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -554,6 +554,7 @@ fi
554AC_SUBST(ELM_EMAP_DEF) 554AC_SUBST(ELM_EMAP_DEF)
555 555
556ELM_WEB_DEF="#undef" 556ELM_WEB_DEF="#undef"
557ELM_WEB2_DEF="#undef"
557 558
558elementary_web_backend="detect" 559elementary_web_backend="detect"
559elementary_web="no" 560elementary_web="no"
@@ -588,10 +589,12 @@ if test "x$want_elementary_web" != "xnone"; then
588 "WebKit's data dir") 589 "WebKit's data dir")
589 if test "x$elementary_web_backend" = "xewebkit2"; then 590 if test "x$elementary_web_backend" = "xewebkit2"; then
590 AC_DEFINE(USE_WEBKIT2, 1, [Use ewebkit2 as Elementary web backend]) 591 AC_DEFINE(USE_WEBKIT2, 1, [Use ewebkit2 as Elementary web backend])
592 ELM_WEB2_DEF="#define"
593 else
594 ELM_WEB_DEF="#define"
591 fi 595 fi
592 596
593 elementary_web=$want_elementary_web 597 elementary_web=$want_elementary_web
594 ELM_WEB_DEF="#define"
595 requirement_elm="${want_elementary_web} ${requirement_elm}" 598 requirement_elm="${want_elementary_web} ${requirement_elm}"
596 ], 599 ],
597 [elementary_web="no"] 600 [elementary_web="no"]
@@ -606,6 +609,7 @@ if test "x$elementary_web_backend" = "xewebkit" -o "x$elementary_web_backend" =
606 fi 609 fi
607fi 610fi
608AC_SUBST(ELM_WEB_DEF) 611AC_SUBST(ELM_WEB_DEF)
612AC_SUBST(ELM_WEB2_DEF)
609 613
610ELM_DEBUG_DEF="#undef" 614ELM_DEBUG_DEF="#undef"
611want_elementary_debug="no" 615want_elementary_debug="no"
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index aaee0666f..0553b8d17 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
19@ELEMENTARY_WINCE_CFLAGS@ \ 19@ELEMENTARY_WINCE_CFLAGS@ \
20@ELEMENTARY_ELOCATION_CFLAGS@ \ 20@ELEMENTARY_ELOCATION_CFLAGS@ \
21@ELEMENTARY_EWEATHER_CFLAGS@ \ 21@ELEMENTARY_EWEATHER_CFLAGS@ \
22@ELEMENTARY_WEB_CFLAGS@ \
22@ELEMENTARY_EMAP_CFLAGS@ 23@ELEMENTARY_EMAP_CFLAGS@
23 24
24noinst_DATA = widget_preview_prefs.epb 25noinst_DATA = widget_preview_prefs.epb
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index 1e7edb3b9..dccc93d7d 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
16@ELEMENTARY_WINCE_CFLAGS@ \ 16@ELEMENTARY_WINCE_CFLAGS@ \
17@ELEMENTARY_ELOCATION_CFLAGS@ \ 17@ELEMENTARY_ELOCATION_CFLAGS@ \
18@ELEMENTARY_EMAP_CFLAGS@ \ 18@ELEMENTARY_EMAP_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \
19@ELEMENTARY_WAYLAND_CFLAGS@ \ 20@ELEMENTARY_WAYLAND_CFLAGS@ \
20@EVIL_CFLAGS@ 21@EVIL_CFLAGS@
21 22
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 74f3683fc..c2a8660bc 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -16,6 +16,7 @@
16@ELM_WINCE_DEF@ ELM_WINCE 16@ELM_WINCE_DEF@ ELM_WINCE
17@ELM_ELOCATION_DEF@ ELM_ELOCATION 17@ELM_ELOCATION_DEF@ ELM_ELOCATION
18@ELM_WEB_DEF@ ELM_WEB 18@ELM_WEB_DEF@ ELM_WEB
19@ELM_WEB2_DEF@ ELM_WEB2
19@ELM_EMAP_DEF@ ELM_EMAP 20@ELM_EMAP_DEF@ ELM_EMAP
20@ELM_DEBUG_DEF@ ELM_DEBUG 21@ELM_DEBUG_DEF@ ELM_DEBUG
21@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H 22@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
@@ -92,6 +93,14 @@
92#include <EMap.h> 93#include <EMap.h>
93#endif 94#endif
94 95
96#ifdef ELM_WEB
97#include <EWebKit.h>
98#endif
99
100#ifdef ELM_WEB2
101#include <EWebKit2.h>
102#endif
103
95#ifdef EAPI 104#ifdef EAPI
96# undef EAPI 105# undef EAPI
97#endif 106#endif
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index 06d3f90dd..fc1913982 100644
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -22,7 +22,6 @@ EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
22#define MY_CLASS_NAME_LEGACY "elm_web" 22#define MY_CLASS_NAME_LEGACY "elm_web"
23 23
24#ifdef HAVE_ELEMENTARY_WEB 24#ifdef HAVE_ELEMENTARY_WEB
25#include <EWebKit.h>
26 25
27/* Similar to iPhone */ 26/* Similar to iPhone */
28// TODO: switch between iPhone, iPad or Chrome/Safari based on some 27// TODO: switch between iPhone, iPad or Chrome/Safari based on some
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 2baf93020..b911a557b 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -8,7 +8,6 @@
8#include "elm_widget_web.h" 8#include "elm_widget_web.h"
9 9
10#if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2) 10#if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2)
11#include <EWebKit2.h>
12 11
13EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP; 12EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
14 13