system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-05 04:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

wcap: Add option to disable building wcap tools

Browse source
This commit is contained in:
Kristian Høgsberg 2012-05-26 13:19:22 -04:00
parent 210eb9d2ba
commit 61cfa66d6f
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile.am
View file

@ -1,3 +1,10 @@
SUBDIRS = shared src clients wcap data protocol tests
if BUILD_WCAP_TOOLS
wcap_subdir = wcap
endif
SUBDIRS = shared src clients data protocol tests $(wcap_subdir)
DIST_SUBDIRS = $(SUBDIRS) wcap
DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install

18
configure.ac
View file

@ -27,11 +27,6 @@ AC_SUBST(DLOPEN_LIBS)
PKG_CHECK_MODULES(COMPOSITOR,
[wayland-server egl >= 7.10 glesv2 xkbcommon pixman-1])
PKG_CHECK_MODULES(WCAP, [cairo vpx])
AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT")
AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],,
enable_setuid_install=yes)
@ -183,6 +178,19 @@ AC_ARG_ENABLE(tablet-shell, [ --enable-tablet-shell],,
AM_CONDITIONAL(ENABLE_TABLET_SHELL,
test x$enable_tablet_shell = xyes)
AC_ARG_ENABLE(wcap-tools, [ --disable-wcap-tools],, enable_wcap_tools=yes)
AM_CONDITIONAL(BUILD_WCAP_TOOLS, test x$enable_wcap_tools = xyes)
if test x$enable_wcap_tools = xyes; then
AC_DEFINE([BUILD_WCAP_TOOLS], [1], [Build the wcap tools])
PKG_CHECK_MODULES(WCAP, [cairo vpx])
WCAP_LIBS="$WCAP_LIBS -lm"
fi
AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT")
if test "x$GCC" = "xyes"; then
GCC_CFLAGS="-Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wno-unused-parameter -Wno-missing-field-initializers \