diff options
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 9ba8da4..cd05f70 100644 --- a/configure.ac +++ b/configure.ac @@ -33,13 +33,13 @@ AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT") AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],, 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(xserver-launcher, [ --enable-xserver-launcher],, enable_xserver_launcher=yes) -AM_CONDITIONAL(ENABLE_XSERVER_LAUNCHER, test x$enable_xserver_launcher == xyes) -if test x$enable_xserver_launcher == xyes; then +AM_CONDITIONAL(ENABLE_XSERVER_LAUNCHER, test x$enable_xserver_launcher = xyes) +if test x$enable_xserver_launcher = xyes; then PKG_CHECK_MODULES([XSERVER_LAUNCHER], xcb xcb-xfixes) AC_DEFINE([BUILD_XSERVER_LAUNCHER], [1], [Build the X server launcher]) @@ -52,8 +52,8 @@ fi AC_ARG_ENABLE(x11-compositor, [ --enable-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 +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 xcb_save_CFLAGS=$CFLAGS @@ -70,8 +70,8 @@ fi AC_ARG_ENABLE(drm-compositor, [ --enable-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 +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.23 gbm]) fi @@ -79,8 +79,8 @@ fi AC_ARG_ENABLE(openwfd-compositor, [ --enable-openwfd-compositor],, enable_openwfd_compositor=no) -AM_CONDITIONAL(ENABLE_OPENWFD_COMPOSITOR, test x$enable_openwfd_compositor == xyes) -if test x$enable_openwfd_compositor == xyes; then +AM_CONDITIONAL(ENABLE_OPENWFD_COMPOSITOR, test x$enable_openwfd_compositor = xyes) +if test x$enable_openwfd_compositor = xyes; then AC_DEFINE([BUILD_OPENWFD_COMPOSITOR], [1], [Build the OpenWF compositor]) PKG_CHECK_MODULES(OPENWFD_COMPOSITOR, [openwfd gbm]) fi @@ -89,8 +89,8 @@ fi AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, enable_wayland_compositor=yes) AM_CONDITIONAL(ENABLE_WAYLAND_COMPOSITOR, - test x$enable_wayland_compositor == xyes) -if test x$enable_wayland_compositor == xyes; then + test x$enable_wayland_compositor = xyes) +if test x$enable_wayland_compositor = xyes; then AC_DEFINE([BUILD_WAYLAND_COMPOSITOR], [1], [Build the Wayland (nested) compositor]) PKG_CHECK_MODULES(WAYLAND_COMPOSITOR, [wayland-client wayland-egl]) @@ -100,21 +100,21 @@ AC_ARG_WITH(cairo-glesv2, AS_HELP_STRING([--with-cairo-glesv2], [Use GLESv2 cairo instead of full GL]), [cairo_modules="cairo-glesv2"], [cairo_modules="cairo-gl"]) -if test x$cairo_modules == xcairo-glesv2; then +if test x$cairo_modules = xcairo-glesv2; then AC_DEFINE([USE_CAIRO_GLESV2], [1], [Use the GLESv2 GL cairo backend]) fi AC_ARG_ENABLE(simple-clients, [ --enable-simple-clients],, enable_simple_clients=yes) -AM_CONDITIONAL(BUILD_SIMPLE_CLIENTS, test x$enable_simple_clients == xyes) -if test x$enable_simple_clients == xyes; then +AM_CONDITIONAL(BUILD_SIMPLE_CLIENTS, test x$enable_simple_clients = xyes) +if test x$enable_simple_clients = xyes; then AC_DEFINE([BUILD_SIMPLE_CLIENTS], [1], [Build the Wayland simple clients]) PKG_CHECK_MODULES(SIMPLE_CLIENT, [egl >= 7.10 glesv2 wayland-client wayland-egl]) fi 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 +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(CLIENT, [wayland-client wayland-egl egl >= 7.10 cairo >= 1.10.0 gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 xkbcommon libpng]) @@ -129,7 +129,7 @@ if test x$enable_clients == xyes; then [AC_MSG_WARN([Cairo-EGL not found - clients will use cairo image])]) AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes) - if test x$have_jpeglib == xyes; then + if test x$have_jpeglib = xyes; then CLIENT_LIBS="$CLIENT_LIBS -ljpeg" else AC_ERROR([libjpeg not found]) @@ -140,14 +140,14 @@ fi AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS, - test x$cairo_modules == "xcairo-gl" -a "x$have_cairo_egl" = "xyes") + test x$cairo_modules = "xcairo-gl" -a "x$have_cairo_egl" = "xyes") AM_CONDITIONAL(ENABLE_DESKTOP_SHELL, true) AC_ARG_ENABLE(tablet-shell, [ --enable-tablet-shell],, enable_tablet_shell=yes) AM_CONDITIONAL(ENABLE_TABLET_SHELL, - test x$enable_tablet_shell == xyes) + test x$enable_tablet_shell = xyes) if test "x$GCC" = "xyes"; then GCC_CFLAGS="-Wall -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden" @@ -164,7 +164,7 @@ AC_CONFIG_FILES([Makefile protocol/Makefile]) AC_OUTPUT -if test "x$enable_setuid_install" == xyes; then +if test "x$enable_setuid_install" = xyes; then AC_MSG_WARN([ *** You've enabled the setuid install hook. Weston is still a |