diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-01 12:47:40 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-01 13:52:20 -0800 |
| commit | ea520d510c45eaba00ad8633888c09dd5a886d2e (patch) | |
| tree | 3a50fa7cc695b6b1caedaa9863ff5b26f692620d | |
| parent | ead5242e0719d758b65465379f9b5be570426b38 (diff) | |
build: Rename option and conditional for installing demo clients
Previously the option was --enable-demo-clients and the conditional was
ENABLE_DEMO_CLIENTS. They control whether or not we install the demo clients
(ie all other clients than weston-terminal and weston-info). Rename the
option and the conditional to better reflect this.
| -rw-r--r-- | clients/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/clients/Makefile.am b/clients/Makefile.am index bdbe1b9c..2f14fbd5 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -9,7 +9,7 @@ demo_clients = \ $(simple_clients_programs) \ $(simple_egl_clients_programs) -if ENABLE_DEMO_CLIENTS +if INSTALL_DEMO_CLIENTS bin_PROGRAMS += $(demo_clients) else noinst_PROGRAMS = $(demo_clients) diff --git a/configure.ac b/configure.ac index adf1bae4..01919410 100644 --- a/configure.ac +++ b/configure.ac @@ -459,11 +459,11 @@ AC_MSG_NOTICE([Weston's default desktop shell client: $WESTON_SHELL_CLIENT]) AC_DEFINE_UNQUOTED([WESTON_SHELL_CLIENT], ["$WESTON_SHELL_CLIENT"], [The default desktop shell client to load.]) -AC_ARG_ENABLE(demo-clients, - AS_HELP_STRING([--enable-demo-clients], - [install demo clients built with weston]),, - enable_demo_clients=no) -AM_CONDITIONAL(ENABLE_DEMO_CLIENTS, [test "x$enable_demo_clients" = "xyes"]) +AC_ARG_ENABLE(demo-clients-install, + AS_HELP_STRING([--enable-demo-clients-install], + [Install demo clients built with weston]),, + install_demo_clients=no) +AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "install_demo_clients" = "xyes"]) PKG_CHECK_MODULES(LCMS, lcms2, [have_lcms=yes], [have_lcms=no]) @@ -534,7 +534,7 @@ AC_MSG_RESULT([ Build Simple Clients ${enable_simple_clients} Build Simple EGL Clients ${enable_simple_egl_clients} - Install Demo Clients ${enable_demo_clients} + Install Demo Clients ${install_demo_clients} Colord Support ${have_colord} GLU Support ${have_glu} |