Commit d30a123e authored by Luca Barbato's avatar Luca Barbato Committed by Felix Paul Kühne

build: Explicitly check for XCB in the Makefile

And thus simplify the conditional blocks.
Signed-off-by: Felix Paul Kühne's avatarFelix Paul Kühne <fkuehne@videolan.org>
parent be7ae9d9
......@@ -250,7 +250,7 @@ dnl GTK+ for linux toolbar
AC_ARG_WITH([gtk], AS_HELP_STRING([--with-gtk], [Build the GTK+ toolbars in NPAPI plugin [default=auto]]),, [with_gtk=yes])
gtk_found=no
AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ], [
PKG_CHECK_MODULES(XCB, [xcb x11-xcb],[], [
PKG_CHECK_MODULES(XCB, [xcb x11-xcb],[xcb_found=yes], [
AC_MSG_ERROR([Please install the libxcb and x11-xcb development files])
])
AS_IF([ test "x$with_gtk" != "xno" ],
......@@ -261,6 +261,7 @@ AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ], [
AS_IF([ test "x$gtk_found" = "xyes" ],
AC_DEFINE([USE_GTK], [1], [Define to 1 if using GTK+]))
AM_CONDITIONAL(WITH_GTK, [ test "x$gtk_found" = "xyes" ])
AM_CONDITIONAL(HAVE_XCB, [ test "x$xcb_found" = "xyes" ])
dnl
dnl final flags for ActiveX
......
......@@ -52,8 +52,7 @@ npapi-sdk:
svn export http://npapi-sdk.googlecode.com/svn/trunk/headers npapi-sdk-svn -r HEAD
mv npapi-sdk-svn npapi-sdk
if !HAVE_DARWIN
if !HAVE_WIN32
if HAVE_XCB
# Unix (x11) platforms
#
......@@ -85,7 +84,9 @@ SOURCES_support += \
vlcplugin_xcb.h
endif # !USE_GTK
else # Win32
endif
if HAVE_WIN32
# Under Win32|Mac, Mozilla plugins need to be named NP******.DLL, but under Unix
# the common naming scheme is lib******plugin.so.
......@@ -122,7 +123,8 @@ npvlc_rc.$(OBJEXT): package/npvlc_rc.rc
$(WINDRES) --include-dir $(srcdir) -i $< -o $@
endif
else
if HAVE_DARWIN
if FETCH_NPAPI
$(npvlc_la_OBJECTS): npapi-sdk
......
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