Commit 89249603 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

XCB: use automake conditional

parent 9c42dd14
......@@ -3187,11 +3187,12 @@ AC_ARG_ENABLE(xvideo,
])
need_xid_provider="no"
have_xcb="no"
AS_IF([test "${enable_xcb}" != "no"], [
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
have_xcb="yes"
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
VLC_ADD_PLUGIN([xscreensaver xcb_x11 xcb_window xcb_screen xcb_apps])
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
......@@ -3233,8 +3234,8 @@ AS_IF([test "${enable_xcb}" != "no"], [
VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
])
VLC_ADD_PLUGIN([xdg_screensaver])
])
AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"])
AC_ARG_ENABLE(glx,
[ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [
......
......@@ -94,7 +94,9 @@ libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_LIBS)
libxcb_screen_plugin_la_DEPENDENCIES =
if HAVE_XCB
libvlc_LTLIBRARIES += libxcb_screen_plugin.la
endif
EXTRA_LTLIBRARIES += \
libaccess_rtmp_plugin.la \
libxcb_screen_plugin.la
libvlc_LTLIBRARIES += $(LTLIBxcb_screen)
libaccess_rtmp_plugin.la
......@@ -19,8 +19,20 @@ SOURCES_audioscrobbler = audioscrobbler.c
SOURCES_inhibit = inhibit.c
SOURCES_sqlite = sqlite.c
SOURCES_xscreensaver = inhibit/xscreensaver.c
SOURCES_xdg_screensaver = inhibit/xdg.c
libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
libxdg_screensaver_plugin_la_DEPENDENCIES =
libxscreensaver_plugin_la_SOURCES = inhibit/xscreensaver.c
libxscreensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
libxscreensaver_plugin_la_LIBADD = $(AM_LIBADD)
libxscreensaver_plugin_la_DEPENDENCIES =
if HAVE_XCB
libvlc_LTLIBRARIES += \
libxdg_screensaver_plugin.la \
libxscreensaver_plugin.la
endif
SOURCES_osso_screensaver = inhibit/osso.c
libvlc_LTLIBRARIES += \
......
......@@ -20,13 +20,14 @@ libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) \
libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_LIBS)
libxcb_apps_plugin_la_DEPENDENCIES =
if HAVE_XCB
libvlc_LTLIBRARIES += libxcb_apps_plugin.la
endif
EXTRA_LTLIBRARIES += \
libudev_plugin.la \
libxcb_apps_plugin.la
libudev_plugin.la
libvlc_LTLIBRARIES += \
libmediadirs_plugin.la \
libpodcast_plugin.la \
libsap_plugin.la \
$(LTLIBudev) \
$(LTLIBxcb_apps)
$(LTLIBudev)
......@@ -58,16 +58,17 @@ libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_KEYSYMS_LIBS)
libxcb_window_plugin_la_DEPENDENCIES =
EXTRA_LTLIBRARIES += \
if HAVE_XCB
libvlc_LTLIBRARIES += \
libxcb_x11_plugin.la \
libxcb_xv_plugin.la \
libxcb_glx_plugin.la \
libxcb_window_plugin.la
endif
EXTRA_LTLIBRARIES += \
libxcb_xv_plugin.la \
libxcb_glx_plugin.la
libvlc_LTLIBRARIES += \
$(LTLIBxcb_x11) \
$(LTLIBxcb_xv) \
$(LTLIBxcb_glx) \
$(LTLIBxcb_window)
$(LTLIBxcb_glx)
# XXX: do we need yet another modules/ subdirectory?
libdrawable_plugin_la_SOURCES = drawable.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment