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

build: Rename option and conditional for installing demo clients

Browse Source 
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.
This commit is contained in:
Kristian Høgsberg
2014-01-01 12:47:40 -08:00
parent ead5242e07
commit ea520d510c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/Makefile.am
+1 -1
View File
@@ -9,7 +9,7 @@ demo_clients = \
$(simple_clients_programs) \ $(simple_clients_programs) \
$(simple_egl_clients_programs) $(simple_egl_clients_programs)
if ENABLE_DEMO_CLIENTS if INSTALL_DEMO_CLIENTS
bin_PROGRAMS += $(demo_clients) bin_PROGRAMS += $(demo_clients)
else else
noinst_PROGRAMS = $(demo_clients) noinst_PROGRAMS = $(demo_clients)
configure.ac
+6 -6
View File
@@ -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"], AC_DEFINE_UNQUOTED([WESTON_SHELL_CLIENT], ["$WESTON_SHELL_CLIENT"],
[The default desktop shell client to load.]) [The default desktop shell client to load.])
AC_ARG_ENABLE(demo-clients, AC_ARG_ENABLE(demo-clients-install,
AS_HELP_STRING([--enable-demo-clients], AS_HELP_STRING([--enable-demo-clients-install],
[install demo clients built with weston]),, [Install demo clients built with weston]),,
enable_demo_clients=no) install_demo_clients=no)
AM_CONDITIONAL(ENABLE_DEMO_CLIENTS, [test "x$enable_demo_clients" = "xyes"]) AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "install_demo_clients" = "xyes"])
PKG_CHECK_MODULES(LCMS, lcms2, PKG_CHECK_MODULES(LCMS, lcms2,
[have_lcms=yes], [have_lcms=no]) [have_lcms=yes], [have_lcms=no])
@@ -534,7 +534,7 @@ AC_MSG_RESULT([
Build Simple Clients ${enable_simple_clients} Build Simple Clients ${enable_simple_clients}
Build Simple EGL Clients ${enable_simple_egl_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} Colord Support ${have_colord}
GLU Support ${have_glu} GLU Support ${have_glu}