[vlc-commits] Wayland: check HAVE_WAYLAND_EGL

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 16 20:55:37 2014 +0300| [cf100d4284140e96586025d9c05b1a62d7d0f418] | committer: Rémi Denis-Courmont

Wayland: check HAVE_WAYLAND_EGL

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cf100d4284140e96586025d9c05b1a62d7d0f418
---

 modules/video_output/Makefile.am |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 326a5a5..dccc3fa6 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -133,25 +133,26 @@ libwl_shm_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
 libwl_shm_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS)
 EXTRA_DIST += video_output/wayland/scaler.xml
 CLEANFILES += $(nodist_libwl_shm_plugin_la_SOURCES)
-if HAVE_WAYLAND
-BUILT_SOURCES += video_output/wayland/scaler-client-protocol.h
-vout_LTLIBRARIES += libwl_shm_plugin.la
-endif
 
 libwl_shell_surface_plugin_la_SOURCES = video_output/wayland/shell_surface.c
 libwl_shell_surface_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
 libwl_shell_surface_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
-if HAVE_WAYLAND
-vout_LTLIBRARIES += libwl_shell_surface_plugin.la
-endif
 
 libegl_wl_plugin_la_SOURCES = video_output/egl.c
 libegl_wl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WAYLAND=1
 libegl_wl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) $(WAYLAND_EGL_CFLAGS)
 libegl_wl_plugin_la_LIBADD = $(EGL_LIBS) $(WAYLAND_EGL_LIBS)
+
+if HAVE_WAYLAND
+BUILT_SOURCES += video_output/wayland/scaler-client-protocol.h
+vout_LTLIBRARIES += libwl_shm_plugin.la
+vout_LTLIBRARIES += libwl_shell_surface_plugin.la
+if HAVE_WAYLAND_EGL
 if HAVE_EGL
 vout_LTLIBRARIES += libegl_wl_plugin.la
 endif
+endif
+endif
 
 
 ### Win32 ###