diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2013-02-18 20:38:22 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-02-18 16:03:51 -0500 |
| commit | bb41005259a442446214005cbfa630f15bd14478 (patch) | |
| tree | 35637c1ed0b20638f03ccc3b591d89fb9c398098 /configure.ac | |
| parent | 2f07ef6963a81cffabdac33c19c413db5bebc499 (diff) | |
configure.ac: Make xwayland tests depend on xwayland
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 5bd554cd..74eb892f 100644 --- a/configure.ac +++ b/configure.ac @@ -62,7 +62,10 @@ AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes) AC_ARG_ENABLE(xwayland, [ --enable-xwayland],, 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, test x$enable_xwayland = xyes -a x$enable_xwayland_test = xyes) if test x$enable_xwayland = xyes; then PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes xcursor cairo-xcb) 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"], [XSERVER_PATH="$bindir/Xorg"]) AC_SUBST([XSERVER_PATH]) + if test x$enable_xwayland_test = xyes; then + PKG_CHECK_MODULES([XWAYLAND_TEST], xcb xcb-dri2 libdrm) + 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],, enable_x11_compositor=yes) |