[PATCH weston 07/11] configure.ac: m4-quote AM_CONDITIONAL tests
Kristian Høgsberg
hoegsberg at gmail.com
Mon Dec 16 17:03:13 PST 2013
On Sun, Dec 08, 2013 at 07:45:39PM +0100, Quentin Glidic wrote:
> From: Quentin Glidic <sardemff7+git at sardemff7.net>
This currently works as is... why add more quoting?
Kristian
> Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
> ---
> configure.ac | 48 ++++++++++++++++++++++++------------------------
> 1 file changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 157dc3a..d5eb04b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -68,7 +68,7 @@ AC_ARG_ENABLE(egl,
> AS_HELP_STRING([--disable-egl],
> [Disable EGL support]),,
> enable_egl=yes)
> -AM_CONDITIONAL(ENABLE_EGL, test "x$enable_egl" = "xyes")
> +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])
> PKG_CHECK_MODULES(EGL, [egl >= 7.10 glesv2])
> @@ -93,7 +93,7 @@ AC_ARG_ENABLE(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")
> +AM_CONDITIONAL(ENABLE_SETUID_INSTALL, [test "x$enable_setuid_install" = "xyes"])
>
>
> AC_ARG_ENABLE(xwayland,
> @@ -104,8 +104,8 @@ 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")
> +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 xcb-composite xcursor cairo-xcb)
> AC_DEFINE([BUILD_XWAYLAND], [1], [Build the X server launcher])
> @@ -127,7 +127,7 @@ 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")
> +AM_CONDITIONAL(ENABLE_X11_COMPOSITOR, [test "x$enable_x11_compositor" = "xyes"])
> if test "x$enable_x11_compositor" = "xyes"; then
> PKG_CHECK_MODULES([XCB], xcb)
> xcb_save_LIBS=$LIBS
> @@ -165,7 +165,7 @@ 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")
> +AM_CONDITIONAL(ENABLE_DRM_COMPOSITOR, [test "x$enable_drm_compositor" = "xyes"])
> if test "x$enable_drm_compositor" = "xyes"; then
> AC_DEFINE([BUILD_DRM_COMPOSITOR], [1], [Build the DRM compositor])
> PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm >= 2.4.30 gbm mtdev >= 1.1.0])
> @@ -192,14 +192,14 @@ AC_ARG_ENABLE(headless-compositor,
> [Disable Headless compositor.]),,
> enable_headless_compositor=yes)
> AM_CONDITIONAL(ENABLE_HEADLESS_COMPOSITOR,
> - test "x$enable_headless_compositor" = "xyes")
> + [test "x$enable_headless_compositor" = "xyes"])
>
>
> AC_ARG_ENABLE(rpi-compositor,
> AS_HELP_STRING([--disable-rpi-compositor],
> [Disable Raspberry Pi backend]),,
> enable_rpi_compositor=yes)
> -AM_CONDITIONAL(ENABLE_RPI_COMPOSITOR, test "x$enable_rpi_compositor" = "xyes")
> +AM_CONDITIONAL(ENABLE_RPI_COMPOSITOR, [test "x$enable_rpi_compositor" = "xyes"])
> have_bcm_host="no"
> if test "x$enable_rpi_compositor" = "xyes"; then
> AC_DEFINE([BUILD_RPI_COMPOSITOR], [1], [Build the compositor for Raspberry Pi])
> @@ -209,7 +209,7 @@ if test "x$enable_rpi_compositor" = "xyes"; then
> AC_DEFINE([HAVE_BCM_HOST], [1], [have Raspberry Pi BCM headers])],
> [AC_MSG_WARN([Raspberry Pi BCM host libraries not found, will use stubs instead.])])
> fi
> -AM_CONDITIONAL(INSTALL_RPI_COMPOSITOR, test "x$have_bcm_host" = "xyes")
> +AM_CONDITIONAL(INSTALL_RPI_COMPOSITOR, [test "x$have_bcm_host" = "xyes"])
>
>
> AC_ARG_ENABLE(fbdev-compositor,
> @@ -285,7 +285,7 @@ if test "x$enable_vaapi_recorder" != "xno"; then
> AS_IF([test "x$have_libva" = "xyes"],
> [AC_DEFINE([BUILD_VAAPI_RECORDER], [1], [Build the vaapi recorder])])
> fi
> -AM_CONDITIONAL(ENABLE_VAAPI_RECORDER, test "x$have_libva" = "xyes")
> +AM_CONDITIONAL(ENABLE_VAAPI_RECORDER, [test "x$have_libva" = "xyes"])
>
>
> AC_SEARCH_LIBS([jpeg_CreateDecompress], [jpeg])
> @@ -304,7 +304,7 @@ AC_ARG_ENABLE(simple-clients,
> 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")
> +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
> @@ -313,7 +313,7 @@ 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")
> -AM_CONDITIONAL(BUILD_SIMPLE_EGL_CLIENTS, test "x$enable_simple_egl_clients" = "xyes")
> +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])
> @@ -323,7 +323,7 @@ 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")
> +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])
>
> @@ -358,7 +358,7 @@ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login],
> [have_systemd_login=yes], [have_systemd_login=no])
> AS_IF([test "x$have_systemd_login" = "xyes"],
> [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
> -AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
> +AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, [test "x$have_systemd_login" = "xyes"])
>
> PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
> [have_systemd_login_209=yes], [have_systemd_login_209=no])
> @@ -371,7 +371,7 @@ AC_ARG_ENABLE(weston-launch,
> devices that require privileges for weston to use
> them.]),,
> enable_weston_launch=yes)
> -AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test "x$enable_weston_launch" = "xyes")
> +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])
> case "$ac_cv_search_pam_open_session" in
> @@ -385,18 +385,18 @@ fi
> if test "x$enable_egl" = "xyes"; then
> PKG_CHECK_MODULES(GLU, [glu], [have_glu=yes], [have_glu=no])
> fi
> -AM_CONDITIONAL(HAVE_GLU, test "x$have_glu" = "xyes")
> +AM_CONDITIONAL(HAVE_GLU, [test "x$have_glu" = "xyes"])
>
>
> -AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")
> +AM_CONDITIONAL(HAVE_POPPLER, [test "x$have_poppler" = "xyes"])
>
> -AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
> +AM_CONDITIONAL(HAVE_PANGO, [test "x$have_pango" = "xyes"])
>
> AM_CONDITIONAL(HAVE_CAIRO_GLESV2,
> [test "x$have_cairo_egl" = "xyes" -a "x$cairo_modules" = "xcairo-glesv2" -a "x$enable_egl" = "xyes"])
>
> AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS,
> - test "x$cairo_modules" = "xcairo-gl" -a "x$have_cairo_egl" = "xyes" -a "x$enable_egl" = "xyes")
> + [test "x$cairo_modules" = "xcairo-gl" -a "x$have_cairo_egl" = "xyes" -a "x$enable_egl" = "xyes"])
>
> AM_CONDITIONAL(BUILD_SUBSURFACES_CLIENT,
> [test '(' "x$have_cairo_egl" != "xyes" -o "x$cairo_modules" = "xcairo-glesv2" ')' -a "x$enable_simple_egl_clients" = "xyes"])
> @@ -420,7 +420,7 @@ if test "x$enable_colord" != "xno"; then
> enable_colord=yes
> fi
> fi
> -AM_CONDITIONAL(ENABLE_COLORD, test "x$enable_colord" = "xyes")
> +AM_CONDITIONAL(ENABLE_COLORD, [test "x$enable_colord" = "xyes"])
>
> # dbus support
> AC_ARG_ENABLE(dbus,
> @@ -442,13 +442,13 @@ if test "x$enable_dbus" != "xno"; then
> enable_dbus=no
> fi
> fi
> -AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes")
> +AM_CONDITIONAL(ENABLE_DBUS, [test "x$enable_dbus" = "xyes"])
>
> 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")
> +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])
> PKG_CHECK_MODULES(WCAP, [cairo])
> @@ -456,10 +456,10 @@ if test "x$enable_wcap_tools" = "xyes"; then
> fi
>
> AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
> -AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT")
> +AM_CONDITIONAL(HAVE_RSVG_CONVERT, [test -n "$RSVG_CONVERT"])
>
> PKG_CHECK_MODULES(SETBACKLIGHT, [libudev libdrm], enable_setbacklight=yes, enable_setbacklight=no)
> -AM_CONDITIONAL(BUILD_SETBACKLIGHT, test "x$enable_setbacklight" = "xyes")
> +AM_CONDITIONAL(BUILD_SETBACKLIGHT, [test "x$enable_setbacklight" = "xyes"])
>
> if test "x$GCC" = "xyes"; then
> GCC_CFLAGS="-Wall -Wextra -Wno-unused-parameter \
> --
> 1.8.4.3
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
More information about the wayland-devel
mailing list