From d201747cc8b0f74035c8069461c7df5704719bfe Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Sat, 5 Oct 2013 08:53:35 -0700 Subject: [PATCH] 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 --- configure.ac | 9 +-------- src/Makefile_Ecore_Wayland.am | 2 ++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index d720310..e9efd1f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am index 0709d6b..607d26e 100644 --- a/src/Makefile_Ecore_Wayland.am +++ b/src/Makefile_Ecore_Wayland.am @@ -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 < $< > $@ -- 2.7.4