diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac index 1ffacde3ce..2d082e15b2 100644 --- a/legacy/elementary/configure.ac +++ b/legacy/elementary/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/legacy/elementary/doc/widgets/Makefile.am b/legacy/elementary/doc/widgets/Makefile.am index aaee0666f0..0553b8d171 100644 --- a/legacy/elementary/doc/widgets/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/edje_externals/Makefile.am b/legacy/elementary/src/edje_externals/Makefile.am index 1e7edb3b9c..dccc93d7da 100644 --- a/legacy/elementary/src/edje_externals/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 74f3683fcf..c2a8660bc3 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/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 #endif +#ifdef ELM_WEB +#include +#endif + +#ifdef ELM_WEB2 +#include +#endif + #ifdef EAPI # undef EAPI #endif diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c index 06d3f90ddd..fc1913982a 100644 --- a/legacy/elementary/src/lib/elm_web.c +++ b/legacy/elementary/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 /* Similar to iPhone */ // TODO: switch between iPhone, iPad or Chrome/Safari based on some diff --git a/legacy/elementary/src/lib/elm_web2.c b/legacy/elementary/src/lib/elm_web2.c index 2baf93020a..b911a557b8 100644 --- a/legacy/elementary/src/lib/elm_web2.c +++ b/legacy/elementary/src/lib/elm_web2.c @@ -8,7 +8,6 @@ #include "elm_widget_web.h" #if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2) -#include EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;