Execute wayland scanner in only wayland environment

Change-Id: I16f2f29d54404123756fcb41ef9bb11510ddba19

diff --git a/configure.ac b/configure.ac
index 3066835..2f3e565 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -234,15 +234,15 @@ PKG_CHECK_MODULES(WAYLAND, [ecore-wayland wayland-client >= 1.2.0 xkbcommon],
                   [ISF_HAS_ECOREWL=yes],
                   [ISF_HAS_ECOREWL=no])
 
-AC_PATH_PROG([wayland_scanner], [wayland-scanner])
-if test x$wayland_scanner = x; then
-    AC_MSG_ERROR([wayland-scanner is needed to compile])
-fi
-
-PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
-
 if test "$ISF_HAS_ECOREWL" = "yes"; then
   AC_DEFINE(HAVE_ECOREWL,1,[Have ecore-wayland functions.])
+
+  AC_PATH_PROG([wayland_scanner], [wayland-scanner])
+  if test x$wayland_scanner = x; then
+      AC_MSG_ERROR([wayland-scanner is needed to compile])
+  fi
+
+  PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
 fi
 
 if test "$ISF_HAS_EFL" = "yes"; then

diff --git a/ism/extras/efl_wsc/Makefile.am b/ism/extras/efl_wsc/Makefile.am
index a9395b6..6589a85 100644 (file)
--- a/ism/extras/efl_wsc/Makefile.am
+++ b/ism/extras/efl_wsc/Makefile.am
@@ -52,6 +52,7 @@ isf_wsc_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
 
 isf_wsc_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
 
+if ISF_BUILD_WSC_EFL
 %-protocol.c : $(top_srcdir)/ism/protocol/%.xml
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@
 
@@ -60,4 +61,4 @@ isf_wsc_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
 
 %-client-protocol.h : $(top_srcdir)/ism/protocol/%.xml
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
-
+endif

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 5444e6e..a2db1dd 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -15,6 +15,7 @@ BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(vconf)
 %if %{with wayland}
 BuildRequires:  pkgconfig(ecore-wayland)
+BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(xkbcommon) >= 0.3.0
 %else
 BuildRequires:  pkgconfig(utilX)