add dummy x11 module

for avoiding build break

Change-Id: Ieb750c5164278967f1d37137e83ef6c7ca75a0fd

diff --git a/configure.ac b/configure.ac
index 39a2c1b22fa01adcb8f64bc850463b3bfdd86db8..cec8ae112a15297debdc2003ca27d861a4952230 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,27 @@ PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
 PKG_CHECK_MODULES(WAYLAND, [wayland-server])
 PKG_CHECK_MODULES(ENLIGHTENMENT, [enlightenment])
 
+dnl ========================================================================
+# checks for wayland only argument
+dnl ========================================================================
+have_wayland_only=no
+AC_ARG_ENABLE([wayland-only],
+  AS_HELP_STRING([--enable-wayland-only],[enable wayland-only version of enlightenment @<:@default=disabled@:>@]),
+  [have_wayland_only=$enableval],
+  [have_wayland_only=no])
+AC_MSG_CHECKING([whether wayland-only version is enabled])
+AM_CONDITIONAL(WAYLAND_ONLY, test x$have_wayland_only = xyes)
+if test "x${have_wayland_only}" != "xno"; then
+  AC_DEFINE_UNQUOTED([HAVE_WAYLAND_ONLY],[1],[enable wayland-only version of enlightenment])
+fi
+
+dnl ========================================================================
+# checks for wayland only argument
+dnl ========================================================================
+if test "x${have_wayland_only}" = "xyes"; then
+  PKG_CHECK_MODULES(WAYLAND, [wayland-server])
+fi
+
 AC_SUBST(ENLIGHTENMENT_CFLAGS)
 AC_SUBST(ENLIGHTENMENT_LIBS)
 

diff --git a/packaging/e-mod-tizen-eom.spec b/packaging/e-mod-tizen-eom.spec
index a290b5d31fc81203485981516895c599d73a6776..52e9762244c79b84fa4edc0ace3a2861227ef020 100644 (file)
--- a/packaging/e-mod-tizen-eom.spec
+++ b/packaging/e-mod-tizen-eom.spec
@@ -12,6 +12,7 @@ License: BSD-2-Clause
 BuildRequires: pkgconfig(enlightenment)
 BuildRequires:  gettext
 %if %{with x}
+BuildRequires:  pkgconfig(x11)
 %endif
 %if %{with wayland}
 BuildRequires:  pkgconfig(wayland-server)
@@ -35,7 +36,7 @@ export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
 
 %autogen
 %if %{with wayland}
-%configure --prefix=/usr
+%configure --prefix=/usr --enable-wayland-only
 %else
 %configure --prefix=/usr
 %endif

diff --git a/src/Makefile.am b/src/Makefile.am
index ee780750f3b9da29b2e773c0539d4248bd8009af..7ae647e68377c84964dabb6b2a5577465c00e5eb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,8 @@ filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 
 pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
 pkg_LTLIBRARIES        = module.la
+
+if WAYLAND_ONLY
 module_la_SOURCES      = e_mod_main.c eom-protocol.c
 module_la_LIBADD       =
 module_la_CFLAGS       = @WAYLAND_CFLAGS@ @ENLIGHTENMENT_CFLAGS@ -DHAVE_WAYLAND_ONLY
@@ -26,3 +28,9 @@ CLEANFILES = $(BUILT_SOURCES)
 
 %-client-protocol.h : $(top_srcdir)/protocol/%.xml
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
+else
+module_la_SOURCES      = e_mod_main_x11.c
+module_la_LIBADD       =
+module_la_CFLAGS       = @ENLIGHTENMENT_CFLAGS@
+module_la_LDFLAGS      = -module -avoid-version @ENLIGHTENMENT_LIBS@
+endif

diff --git a/src/e_mod_main_x11.c b/src/e_mod_main_x11.c
new file mode 100644 (file)
index 0000000..964e025
--- /dev/null
+++ b/src/e_mod_main_x11.c
@@ -0,0 +1,26 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "EOM Module of Window Manager" };
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m EINA_UNUSED)
+{
+
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m EINA_UNUSED)
+{
+   /* Save something to be kept */
+   return 1;
+}
+

diff --git a/src/e_mod_main_x11.h b/src/e_mod_main_x11.h
new file mode 100644 (file)
index 0000000..b848208
--- /dev/null
+++ b/src/e_mod_main_x11.h
@@ -0,0 +1,11 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+/*** E Module ***/
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int   e_modapi_shutdown(E_Module *m);
+EAPI int   e_modapi_save(E_Module *m);
+
+#endif