[PATCH weston 06/11] configure.ac: Make AC_ARG_ENABLE calls consistent
Quentin Glidic
sardemff7+wayland at sardemff7.net
Sun Dec 8 10:45:38 PST 2013
From: Quentin Glidic <sardemff7+git at sardemff7.net>
Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
---
configure.ac | 128 ++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 83 insertions(+), 45 deletions(-)
diff --git a/configure.ac b/configure.ac
index daf81eb..157dc3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,8 +64,10 @@ AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
COMPOSITOR_MODULES="wayland-server >= 1.3.90 pixman-1"
-AC_ARG_ENABLE(egl, [ --disable-egl],,
- enable_egl=yes)
+AC_ARG_ENABLE(egl,
+ AS_HELP_STRING([--disable-egl],
+ [Disable EGL support]),,
+ enable_egl=yes)
AM_CONDITIONAL(ENABLE_EGL, test "x$enable_egl" = "xyes")
if test "x$enable_egl" = "xyes"; then
AC_DEFINE([ENABLE_EGL], [1], [Build Weston with EGL support])
@@ -73,27 +75,35 @@ if test "x$enable_egl" = "xyes"; then
fi
AC_ARG_ENABLE(xkbcommon,
- AS_HELP_STRING([--disable-xkbcommon], [Disable libxkbcommon
- support: This is only useful in environments
- where you do not have a hardware keyboard. If
- libxkbcommon support is disabled clients will not
- be sent a keymap and and must know how to
- interpret the keycode sent for any key event.]),,
+ AS_HELP_STRING([--disable-xkbcommon],
+ [Disable libxkbcommon support: This is only useful
+ in environments where you do not have a hardware
+ keyboard. If libxkbcommon support is disabled
+ clients will not be sent a keymap and and must
+ know how to interpret the keycode sent for any key
+ event.]),,
enable_xkbcommon=yes)
if test "x$enable_xkbcommon" = "xyes"; then
AC_DEFINE(ENABLE_XKBCOMMON, [1], [Build Weston with libxkbcommon support])
COMPOSITOR_MODULES="$COMPOSITOR_MODULES xkbcommon >= 0.3.0"
fi
-AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],,
+AC_ARG_ENABLE(setuid-install,
+ AS_HELP_STRING([--disable-setuid-install],
+ [Disable setuid for weston-launch. Only useful
+ for local installation.]),,
enable_setuid_install=yes)
AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test "x$enable_setuid_install" = "xyes")
-AC_ARG_ENABLE(xwayland, [ --enable-xwayland],,
+AC_ARG_ENABLE(xwayland,
+ AS_HELP_STRING([--disable-xwayland],
+ [Disable XWayland support.]),,
enable_xwayland=yes)
-AC_ARG_ENABLE(xwayland-test, [ --enable-xwayland-test],,
- enable_xwayland_test=yes)
+AC_ARG_ENABLE(xwayland-test,
+ AS_HELP_STRING([--disable-xwayland-test],
+ [Disable XWayland testing.]),,
+ enable_xwayland_test="$enable_xwayland")
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
@@ -112,7 +122,10 @@ fi
PKG_CHECK_MODULES(LIBDRM, [libdrm],
[AC_DEFINE(HAVE_LIBDRM, 1, [Define if libdrm is available]) have_libdrm=yes], have_libdrm=no)
-AC_ARG_ENABLE(x11-compositor, [ --enable-x11-compositor],,
+
+AC_ARG_ENABLE(x11-compositor,
+ AS_HELP_STRING([--disable-x11-compositor],
+ [Disable X11 compositor.]),,
enable_x11_compositor=yes)
AM_CONDITIONAL(ENABLE_X11_COMPOSITOR, test "x$enable_x11_compositor" = "xyes")
if test "x$enable_x11_compositor" = "xyes"; then
@@ -148,7 +161,9 @@ if test "x$enable_x11_compositor" = "xyes"; then
fi
-AC_ARG_ENABLE(drm-compositor, [ --enable-drm-compositor],,
+AC_ARG_ENABLE(drm-compositor,
+ AS_HELP_STRING([--disable-drm-compositor],
+ [Disable DRM compositor.]),,
enable_drm_compositor=yes)
AM_CONDITIONAL(ENABLE_DRM_COMPOSITOR, test "x$enable_drm_compositor" = "xyes")
if test "x$enable_drm_compositor" = "xyes"; then
@@ -158,10 +173,13 @@ fi
PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
-AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
+AC_ARG_ENABLE(wayland-compositor,
+ AS_HELP_STRING([--disable-wayland-compositor],
+ [Disable Wayland (nested) compositor.]),,
enable_wayland_compositor=yes)
AM_CONDITIONAL(ENABLE_WAYLAND_COMPOSITOR,
- test "x$enable_wayland_compositor" = "xyes" -a "x$enable_egl" = "xyes")
+ [test "x$enable_wayland_compositor" = "xyes"
+ -a "x$enable_egl" = "xyes"])
if test "x$enable_wayland_compositor" = "xyes" -a "x$enable_egl" = "xyes"; then
AC_DEFINE([BUILD_WAYLAND_COMPOSITOR], [1],
[Build the Wayland (nested) compositor])
@@ -169,7 +187,9 @@ if test "x$enable_wayland_compositor" = "xyes" -a "x$enable_egl" = "xyes"; then
fi
-AC_ARG_ENABLE(headless-compositor, [ --enable-headless-compositor],,
+AC_ARG_ENABLE(headless-compositor,
+ AS_HELP_STRING([--disable-headless-compositor],
+ [Disable Headless compositor.]),,
enable_headless_compositor=yes)
AM_CONDITIONAL(ENABLE_HEADLESS_COMPOSITOR,
test "x$enable_headless_compositor" = "xyes")
@@ -177,7 +197,7 @@ AM_CONDITIONAL(ENABLE_HEADLESS_COMPOSITOR,
AC_ARG_ENABLE(rpi-compositor,
AS_HELP_STRING([--disable-rpi-compositor],
- [do not build the Raspberry Pi backend]),,
+ [Disable Raspberry Pi backend]),,
enable_rpi_compositor=yes)
AM_CONDITIONAL(ENABLE_RPI_COMPOSITOR, test "x$enable_rpi_compositor" = "xyes")
have_bcm_host="no"
@@ -192,7 +212,9 @@ fi
AM_CONDITIONAL(INSTALL_RPI_COMPOSITOR, test "x$have_bcm_host" = "xyes")
-AC_ARG_ENABLE([fbdev-compositor], [ --enable-fbdev-compositor],,
+AC_ARG_ENABLE(fbdev-compositor,
+ AS_HELP_STRING([--disable-fbdev-compositor],
+ [Disable fbdev compositor.]),,
enable_fbdev_compositor=yes)
AM_CONDITIONAL([ENABLE_FBDEV_COMPOSITOR],
[test "x$enable_fbdev_compositor" = "xyes"])
@@ -201,8 +223,10 @@ AS_IF([test "x$enable_fbdev_compositor" = "xyes"], [
PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0])
])
-AC_ARG_ENABLE([rdp-compositor], [ --enable-rdp-compositor],,
- enable_rdp_compositor=no)
+AC_ARG_ENABLE(rdp-compositor,
+ AS_HELP_STRING([--disable-rdp-compositor],
+ [Disable RDP compositor.]),,
+ enable_rdp_compositor=no)
AM_CONDITIONAL([ENABLE_RDP_COMPOSITOR],
[test "x$enable_rdp_compositor" = "xyes"])
if test "x$enable_rdp_compositor" = "xyes"; then
@@ -248,7 +272,9 @@ PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
AS_IF([test "x$have_webp" = "xyes"],
[AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
-AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],,
+AC_ARG_ENABLE(vaapi-recorder,
+ AS_HELP_STRING([--disable-vaapi-recorder],
+ [Disable VAAPI-recorder.]),,
enable_vaapi_recorder=auto)
if test "x$enable_vaapi_recorder" != "xno"; then
PKG_CHECK_MODULES(LIBVA, [libva >= 0.34.0 libva-drm >= 0.34.0],
@@ -275,25 +301,28 @@ PKG_CHECK_MODULES(CAIRO, [cairo])
PKG_CHECK_MODULES(TEST_CLIENT, [wayland-client])
AC_ARG_ENABLE(simple-clients,
- AS_HELP_STRING([--disable-simple-clients],
- [do not build the simple wl_shm clients]),,
- enable_simple_clients=yes)
+ AS_HELP_STRING([--disable-simple-clients],
+ [Do not build the simple wl_shm clients.]),,
+ enable_simple_clients=yes)
AM_CONDITIONAL(BUILD_SIMPLE_CLIENTS, test "x$enable_simple_clients" = "xyes")
if test "x$enable_simple_clients" = "xyes"; then
PKG_CHECK_MODULES(SIMPLE_CLIENT, [wayland-client])
fi
AC_ARG_ENABLE(simple-egl-clients,
- AS_HELP_STRING([--disable-simple-egl-clients],
- [do not build the simple EGL clients]),,
- enable_simple_egl_clients="$enable_egl")
+ AS_HELP_STRING([--disable-simple-egl-clients],
+ [Do not build the simple EGL clients.]),,
+ enable_simple_egl_clients="$enable_egl")
AM_CONDITIONAL(BUILD_SIMPLE_EGL_CLIENTS, test "x$enable_simple_egl_clients" = "xyes")
if test "x$enable_simple_egl_clients" = "xyes"; then
PKG_CHECK_MODULES(SIMPLE_EGL_CLIENT,
[egl >= 7.10 glesv2 wayland-client wayland-egl wayland-cursor])
fi
-AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes)
+AC_ARG_ENABLE(clients,
+ AS_HELP_STRING([--disable-clients],
+ [Do not build the 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])
@@ -318,9 +347,10 @@ if test "x$enable_clients" = "xyes"; then
fi
AC_ARG_ENABLE(resize-optimization,
- AS_HELP_STRING([--disable-resize-optimization],
- [disable resize optimization allocating a big buffer in toytoolkit]),,
- enable_resize_optimization=yes)
+ AS_HELP_STRING([--disable-resize-optimization],
+ [Disable resize optimization allocating a big
+ buffer in toytoolkit.]),,
+ enable_resize_optimization=yes)
AS_IF([test "x$enable_resize_optimization" = "xyes"],
[AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
@@ -335,7 +365,12 @@ PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
AS_IF([test "x$have_systemd_login_209" = "xyes"],
[AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
-AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes)
+AC_ARG_ENABLE(weston-launch,
+ AS_HELP_STRING([--disable-weston-launch],
+ [Disable weston-launch. Its purpose is to open
+ devices that require privileges for weston to use
+ them.]),,
+ enable_weston_launch=yes)
AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test "x$enable_weston_launch" = "xyes")
if test "x$enable_weston_launch" = "xyes"; then
AC_SEARCH_LIBS([pam_open_session], [pam])
@@ -370,8 +405,8 @@ AM_CONDITIONAL(ENABLE_DESKTOP_SHELL, true)
# CMS modules
AC_ARG_ENABLE(colord,
- AS_HELP_STRING([--disable-colord],
- [do not build colord CMS support]),,
+ AS_HELP_STRING([--disable-colord],
+ [Do not build colord CMS support.]),,
enable_colord=auto)
if test "x$enable_colord" != "xno"; then
PKG_CHECK_MODULES(COLORD,
@@ -389,9 +424,9 @@ AM_CONDITIONAL(ENABLE_COLORD, test "x$enable_colord" = "xyes")
# dbus support
AC_ARG_ENABLE(dbus,
- AS_HELP_STRING([--disable-dbus],
- [do not build with dbus support]),,
- enable_dbus=auto)
+ AS_HELP_STRING([--disable-dbus],
+ [Do not build with D-Bus support.]),,
+ enable_dbus=auto)
if test "x$enable_dbus" != "xno"; then
PKG_CHECK_MODULES(DBUS,
dbus-1 >= 1.6,
@@ -409,7 +444,10 @@ if test "x$enable_dbus" != "xno"; then
fi
AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes")
-AC_ARG_ENABLE(wcap-tools, [ --disable-wcap-tools],, enable_wcap_tools=yes)
+AC_ARG_ENABLE(wcap-tools,
+ AS_HELP_STRING([--disable-wcap-tools],
+ [Disable Weston CAPture tools.]),,
+ enable_wcap_tools=yes)
AM_CONDITIONAL(BUILD_WCAP_TOOLS, test "x$enable_wcap_tools" = "xyes")
if test "x$enable_wcap_tools" = "xyes"; then
AC_DEFINE([BUILD_WCAP_TOOLS], [1], [Build the wcap tools])
@@ -431,9 +469,9 @@ fi
AC_SUBST(GCC_CFLAGS)
AC_ARG_ENABLE(libunwind,
- AS_HELP_STRING([--disable-libunwind],
- [Disable libunwind usage for backtraces]),,
- enable_libunwind=auto)
+ AS_HELP_STRING([--disable-libunwind],
+ [Disable libunwind usage for backtraces.]),,
+ enable_libunwind=auto)
AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$enable_libunwind" = "xyes"])
if test "x$enable_libunwind" != "xno"; then
PKG_CHECK_MODULES(LIBUNWIND,
@@ -465,9 +503,9 @@ 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)
+ 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"])
PKG_CHECK_MODULES(LCMS, lcms2,
--
1.8.4.3
More information about the wayland-devel
mailing list