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.

diff --git a/configure.ac b/configure.ac
index 1ffacde3ce72b1de82074b45ad1145140610426b..2d082e15b234d37b4374747b7e612b827ee9f95c 100644 (file)
--- 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 aaee0666f00fe7c5737d4307dc0acd6bb0c21fd6..0553b8d171b4afe008636cb96832819c98697531 100644 (file)
--- 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 1e7edb3b9c354805b89665c6a45eb46409d7cb9e..dccc93d7da32e07b8a5b468e6c53869f6cc0de5e 100644 (file)
--- 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 74f3683fcf50c2c2700d1a593b4bd66f78b799cb..c2a8660bc3dbf4bc49426002172d173e041ff2ce 100644 (file)
--- 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 06d3f90dddac6cea91514be1609da65a3830af48..fc1913982a7e499e0f8a402b717fad434a4b48a8 100644 (file)
--- 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 2baf93020ac3814795d9a76d892575d44490caee..b911a557b81aa1c9f3c327fe4efdcfadc30532ba 100644 (file)
--- 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;