diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-26 11:47:00 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-26 11:47:00 -0400 |
| commit | 60c15080ab24ae2f4347fb04e39f147c51656688 (patch) | |
| tree | 59f846c6d92bc5ae3ea749f0c7c72bab2edd1a30 | |
| parent | 0b5116f74607dd0159d4cb701988172b0cb9a90a (diff) | |
| download | weston-60c15080ab24ae2f4347fb04e39f147c51656688.tar.gz | |
Add --disable-clients configure option
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 27 |
2 files changed, 23 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index b32051c3..9ab266b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,5 @@ -SUBDIRS = compositor clients data +if BUILD_CLIENTS +clients = clients +endif + +SUBDIRS = compositor $(clients) data diff --git a/configure.ac b/configure.ac index ed9f4a74..e5dd0d60 100644 --- a/configure.ac +++ b/configure.ac @@ -36,11 +36,6 @@ AC_SUBST(DLOPEN_LIBS) PKG_CHECK_MODULES(COMPOSITOR, [wayland-server egl >= 7.10 glesv2 gdk-pixbuf-2.0 pixman-1]) -PKG_CHECK_MODULES(SIMPLE_CLIENT, [egl >= 7.10 glesv2 wayland-client wayland-egl]) -PKG_CHECK_MODULES(CLIENT, [wayland-client wayland-egl egl >= 7.10 gl cairo >= 1.10.0 gdk-pixbuf-2.0 glib-2.0 gobject-2.0 xkbcommon]) -PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0 gio-2.0], - [have_poppler=yes], [have_poppler=no]) -AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert) AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT") @@ -83,10 +78,24 @@ if test x$enable_wayland_compositor == xyes; then fi -PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl >= 1.11.3], - [have_cairo_egl=yes], [have_cairo_egl=no]) -AS_IF([test "x$have_cairo_egl" = "xyes"], - [AC_DEFINE([HAVE_CAIRO_EGL], [1], [Have cairo-egl])]) +AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes) +AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients == xyes) +if test x$enable_clients == xyes; then + AC_DEFINE([BUILD_CLIENTS], [1], [Build the Wayland clients]) + + PKG_CHECK_MODULES(SIMPLE_CLIENT, + [egl >= 7.10 glesv2 wayland-client wayland-egl]) + PKG_CHECK_MODULES(CLIENT, [wayland-client wayland-egl egl >= 7.10 gl cairo >= 1.10.0 gdk-pixbuf-2.0 glib-2.0 gobject-2.0 xkbcommon]) + + PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0 gio-2.0], + [have_poppler=yes], [have_poppler=no]) + PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl >= 1.11.3], + [have_cairo_egl=yes], [have_cairo_egl=no]) + AS_IF([test "x$have_cairo_egl" = "xyes"], + [AC_DEFINE([HAVE_CAIRO_EGL], [1], [Have cairo-egl])]) +fi + +AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") if test "x$GCC" = "xyes"; then GCC_CFLAGS="-Wall -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden" |