ryuan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=166ca9e86a7268855f5c991e379b2c124002ade2
commit 166ca9e86a7268855f5c991e379b2c124002ade2
Author: Ryuan Choi <ryuan.c...@gmail.com>
Date: Fri Dec 13 22:26:02 2013 +0900
web: Include webkit header in Elementary.h when built with ewebkit or
ewebkit2
Like other options, Elementary.h will contain WebKit.h or WebKit2.h when
elementary was built with ewebkit or ewebkit2.
---
configure.ac | 6 +++++-
doc/widgets/Makefile.am | 1 +
src/edje_externals/Makefile.am | 1 +
src/lib/Elementary.h.in | 9 +++++++++
src/lib/elm_web.c | 1 -
src/lib/elm_web2.c | 1 -
6 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1ffacde..2d082e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -554,6 +554,7 @@ fi
AC_SUBST(ELM_EMAP_DEF)
ELM_WEB_DEF="#undef"
+ELM_WEB2_DEF="#undef"
elementary_web_backend="detect"
elementary_web="no"
@@ -588,10 +589,12 @@ if test "x$want_elementary_web" != "xnone"; then
"WebKit's data dir")
if test "x$elementary_web_backend" = "xewebkit2"; then
AC_DEFINE(USE_WEBKIT2, 1, [Use ewebkit2 as Elementary web backend])
+ ELM_WEB2_DEF="#define"
+ else
+ ELM_WEB_DEF="#define"
fi
elementary_web=$want_elementary_web
- ELM_WEB_DEF="#define"
requirement_elm="${want_elementary_web} ${requirement_elm}"
],
[elementary_web="no"]
@@ -606,6 +609,7 @@ if test "x$elementary_web_backend" = "xewebkit" -o
"x$elementary_web_backend" =
fi
fi
AC_SUBST(ELM_WEB_DEF)
+AC_SUBST(ELM_WEB2_DEF)
ELM_DEBUG_DEF="#undef"
want_elementary_debug="no"
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index aaee066..0553b8d 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
+@ELEMENTARY_WEB_CFLAGS@ \
@ELEMENTARY_EMAP_CFLAGS@
noinst_DATA = widget_preview_prefs.epb
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index 1e7edb3..dccc93d 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EMAP_CFLAGS@ \
+@ELEMENTARY_WEB_CFLAGS@ \
@ELEMENTARY_WAYLAND_CFLAGS@ \
@EVIL_CFLAGS@
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 74f3683..c2a8660 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -16,6 +16,7 @@
@ELM_WINCE_DEF@ ELM_WINCE
@ELM_ELOCATION_DEF@ ELM_ELOCATION
@ELM_WEB_DEF@ ELM_WEB
+@ELM_WEB2_DEF@ ELM_WEB2
@ELM_EMAP_DEF@ ELM_EMAP
@ELM_DEBUG_DEF@ ELM_DEBUG
@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
@@ -92,6 +93,14 @@
#include <EMap.h>
#endif
+#ifdef ELM_WEB
+#include <EWebKit.h>
+#endif
+
+#ifdef ELM_WEB2
+#include <EWebKit2.h>
+#endif
+
#ifdef EAPI
# undef EAPI
#endif
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index 06d3f90..fc19139 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;
#define MY_CLASS_NAME_LEGACY "elm_web"
#ifdef HAVE_ELEMENTARY_WEB
-#include <EWebKit.h>
/* Similar to iPhone */
// 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 2baf930..b911a55 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -8,7 +8,6 @@
#include "elm_widget_web.h"
#if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2)
-#include <EWebKit2.h>
EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
--
