mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.ac: Make xwayland tests depend on xwayland

Browse Source 
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic
2013-02-18 20:38:22 +01:00
committed by Kristian Høgsberg
parent 2f07ef6963
commit bb41005259
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+6 -6
View File
@@ -62,7 +62,10 @@ AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes)
AC_ARG_ENABLE(xwayland, [ --enable-xwayland],, AC_ARG_ENABLE(xwayland, [ --enable-xwayland],,
enable_xwayland=yes) enable_xwayland=yes)
AC_ARG_ENABLE(xwayland-test, [ --enable-xwayland-test],,
enable_xwayland_test=yes)
AM_CONDITIONAL(ENABLE_XWAYLAND, test x$enable_xwayland = xyes) AM_CONDITIONAL(ENABLE_XWAYLAND, test x$enable_xwayland = xyes)
AM_CONDITIONAL(ENABLE_XWAYLAND_TEST, test x$enable_xwayland = xyes -a x$enable_xwayland_test = xyes)
if test x$enable_xwayland = xyes; then if test x$enable_xwayland = xyes; then
PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes xcursor cairo-xcb) PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes xcursor cairo-xcb)
AC_DEFINE([BUILD_XWAYLAND], [1], [Build the X server launcher]) AC_DEFINE([BUILD_XWAYLAND], [1], [Build the X server launcher])
@@ -71,14 +74,11 @@ if test x$enable_xwayland = xyes; then
[Path to X server]), [XSERVER_PATH="$withval"], [Path to X server]), [XSERVER_PATH="$withval"],
[XSERVER_PATH="$bindir/Xorg"]) [XSERVER_PATH="$bindir/Xorg"])
AC_SUBST([XSERVER_PATH]) AC_SUBST([XSERVER_PATH])
if test x$enable_xwayland_test = xyes; then
PKG_CHECK_MODULES([XWAYLAND_TEST], xcb xcb-dri2 libdrm)
fi
fi fi
AC_ARG_ENABLE(xwayland-test, [ --enable-xwayland-test],,
enable_xwayland_test=yes)
AM_CONDITIONAL(ENABLE_XWAYLAND_TEST, test x$enable_xwayland_test = xyes)
if test x$enable_xwayland_test = xyes; then
PKG_CHECK_MODULES([XWAYLAND_TEST], xcb xcb-dri2 libdrm)
fi
AC_ARG_ENABLE(x11-compositor, [ --enable-x11-compositor],, AC_ARG_ENABLE(x11-compositor, [ --enable-x11-compositor],,
enable_x11_compositor=yes) enable_x11_compositor=yes)