timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore/wayland: detect wayland-scanner 

We need the wayland-scanner program to auto-generate the
subsurface protocol source files from subsurface.xml

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
U. Artie Eoff 2013-10-05 08:53:35 -07:00 committed by Rafael Antognolli
parent 82e1fef6ed
commit d201747cc8
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -1007,14 +1007,7 @@ AC_ARG_ENABLE([wayland],
if test "${want_wayland}" = "yes"; then
EFL_PKG_CHECK_STRICT([wayland-client])
dnl This is a problem. unless you somehow have this macro defined
dnl magically... you cant do dev on efl. configure is totally broken.
dnl you end up with something like:
dnl
dnl ./configure: line 25508: syntax error near unexpected token `'$(top_srcdir)/data/ecore/ecore_wayland/protocol''
dnl ./configure: line 25508: `WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')'
dnl WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
AC_PATH_PROG([wayland_scanner], [wayland-scanner], [AC_MSG_ERROR("wayland-scanner is needed to compile ecore_wayland protocol")])
fi
# Fb

2
src/Makefile_Ecore_Wayland.am
View File

@ -31,6 +31,8 @@ lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@
lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@
lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
wayland_protocoldir = $(top_srcdir)/data/ecore/ecore_wayland/protocol
lib/ecore_wayland/subsurface-protocol.c: $(wayland_protocoldir)/subsurface.xml
$(AM_V_GEN)$(wayland_scanner) code < $< > $@