X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=bc5c88a8ae2e47f57963986b93b7df346b8f5d62;hb=71182aed843c2927a695c3686d6f7023e44cc0bb;hp=a460d3b6fd93810b2a74e837f8270995d9608912;hpb=02b36f35288b2790456a3395e4977c5af6507a21;p=platform%2Fupstream%2Fweston.git diff --git a/configure.ac b/configure.ac index a460d3b..bc5c88a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ m4_define([weston_major_version], [1]) -m4_define([weston_minor_version], [3]) +m4_define([weston_minor_version], [5]) m4_define([weston_micro_version], [90]) m4_define([weston_version], [weston_major_version.weston_minor_version.weston_micro_version]) @@ -16,12 +16,14 @@ AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version]) AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version]) AC_SUBST([WESTON_VERSION], [weston_version]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE -AM_INIT_AUTOMAKE([1.11 parallel-tests foreign no-dist-gzip dist-xz color-tests]) +AM_INIT_AUTOMAKE([1.11 parallel-tests foreign no-dist-gzip dist-xz color-tests subdir-objects]) AM_SILENT_RULES([yes]) @@ -35,6 +37,8 @@ LT_INIT([disable-static]) AC_ARG_VAR([WESTON_NATIVE_BACKEND], [Set the native backend to use, if Weston is not running under Wayland nor X11. @<:@default=drm-backend.so@:>@]) +AC_ARG_VAR([WESTON_SHELL_CLIENT], + [Set the default desktop shell client to load if none is specified in weston.ini. @<:@default=weston-desktop-shell@:>@]) PKG_PROG_PKG_CONFIG() @@ -53,9 +57,9 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], [[#include ]]) AC_CHECK_HEADERS([execinfo.h]) -AC_CHECK_FUNCS([mkostemp strchrnul initgroups]) +AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) -COMPOSITOR_MODULES="wayland-server >= 1.3.90 pixman-1" +COMPOSITOR_MODULES="wayland-server >= 1.3.90 pixman-1 >= 0.25.2" AC_ARG_ENABLE(egl, [ --disable-egl],, enable_egl=yes) @@ -63,6 +67,7 @@ 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]) + PKG_CHECK_MODULES([EGL_TESTS], [egl >= 7.10 glesv2 wayland-client wayland-egl]) fi AC_ARG_ENABLE(xkbcommon, @@ -95,7 +100,7 @@ if test x$enable_xwayland = xyes; then AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH], [Path to X server]), [XSERVER_PATH="$withval"], - [XSERVER_PATH="$bindir/Xorg"]) + [XSERVER_PATH="$bindir/Xwayland"]) AC_SUBST([XSERVER_PATH]) if test x$enable_xwayland_test = xyes; then PKG_CHECK_MODULES([XWAYLAND_TEST], xcb xcb-dri2 libdrm) @@ -149,6 +154,16 @@ if test x$enable_drm_compositor = xyes; then PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm >= 2.4.30 gbm mtdev >= 1.1.0]) fi + +AC_ARG_ENABLE(libinput-backend, [ --disable-libinput-backend],, + enable_libinput_backend=yes) +AM_CONDITIONAL([ENABLE_LIBINPUT_BACKEND], [test x$enable_libinput_backend = xyes]) +if test x$enable_libinput_backend = xyes; then + AC_DEFINE([BUILD_LIBINPUT_BACKEND], [1], [Build the libinput input device backend]) + PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.5.0]) +fi + + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, @@ -201,6 +216,23 @@ AM_CONDITIONAL([ENABLE_RDP_COMPOSITOR], if test x$enable_rdp_compositor = xyes; then AC_DEFINE([BUILD_RDP_COMPOSITOR], [1], [Build the RDP compositor]) PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp >= 1.1.0]) + + SAVED_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $RDP_COMPOSITOR_CFLAGS" + AC_CHECK_HEADERS([freerdp/version.h]) + CPPFLAGS="$SAVED_CPPFLAGS" +fi + +AC_ARG_ENABLE([screen-sharing], [ --enable-screen-sharing],, + enable_screen_sharing=no) +AM_CONDITIONAL([ENABLE_SCREEN_SHARING], + [test x$enable_screen_sharing = xyes]) +if test x$enable_screen_sharing = xyes; then + PKG_CHECK_MODULES(SCREEN_SHARE, [wayland-client]) + + if test x$enable_rdp_compositor != xyes; then + AC_MSG_WARN([The screen-share.so module requires the RDP backend.]) + fi fi AC_ARG_WITH(cairo, @@ -295,9 +327,6 @@ if test x$enable_clients = xyes; then PKG_CHECK_MODULES(SERVER, [wayland-server]) PKG_CHECK_MODULES(WESTON_INFO, [wayland-client]) - PKG_CHECK_MODULES(POPPLER, [poppler-glib glib-2.0 gobject-2.0 gio-2.0 ], - [have_poppler=yes], [have_poppler=no]) - # Only check for cairo-egl if a GL or GLES renderer requested AS_IF([test "x$cairo_modules" = "xcairo-gl" -o "x$cairo_modules" = "xcairo-glesv2"], [ PKG_CHECK_MODULES(CAIRO_EGL, [wayland-egl egl >= 7.10 cairo-egl >= 1.11.3 $cairo_modules], @@ -317,7 +346,7 @@ AC_ARG_ENABLE(resize-optimization, AS_IF([test "x$enable_resize_optimization" = "xyes"], [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) -PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login], +PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], [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])]) @@ -344,9 +373,6 @@ if test x$enable_egl = xyes; then fi AM_CONDITIONAL(HAVE_GLU, test "x$have_glu" = "xyes") - -AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") - AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") AM_CONDITIONAL(HAVE_CAIRO_GLESV2, @@ -360,12 +386,12 @@ AM_CONDITIONAL(BUILD_SUBSURFACES_CLIENT, AM_CONDITIONAL(ENABLE_DESKTOP_SHELL, true) -AC_ARG_ENABLE(tablet-shell, - AS_HELP_STRING([--disable-tablet-shell], - [do not build tablet-shell server plugin and client]),, - enable_tablet_shell=yes) -AM_CONDITIONAL(ENABLE_TABLET_SHELL, - test "x$enable_tablet_shell" = "xyes") +AC_ARG_ENABLE(fullscreen-shell, + AS_HELP_STRING([--disable-fullscreen-shell], + [do not build fullscreen-shell server plugin]),, + enable_fullscreen_shell=yes) +AM_CONDITIONAL(ENABLE_FULLSCREEN_SHELL, + test "x$enable_fullscreen_shell" = "xyes") # CMS modules AC_ARG_ENABLE(colord, @@ -416,16 +442,13 @@ if test x$enable_wcap_tools = xyes; then WCAP_LIBS="$WCAP_LIBS -lm" fi -AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, 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") if test "x$GCC" = "xyes"; then GCC_CFLAGS="-Wall -Wextra -Wno-unused-parameter \ -Wno-missing-field-initializers -g -fvisibility=hidden \ - -Wstrict-prototypes -Wmissing-prototypes" + -Wstrict-prototypes -Wmissing-prototypes -Wsign-compare" fi AC_SUBST(GCC_CFLAGS) @@ -456,11 +479,18 @@ AC_MSG_NOTICE([Weston's native backend: $WESTON_NATIVE_BACKEND]) AC_DEFINE_UNQUOTED([WESTON_NATIVE_BACKEND], ["$WESTON_NATIVE_BACKEND"], [The default backend to load, if not wayland nor x11.]) -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"]) +if test "x$WESTON_SHELL_CLIENT" = "x"; then + WESTON_SHELL_CLIENT="weston-desktop-shell" +fi +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-install, + AS_HELP_STRING([--enable-demo-clients-install], + [Install demo clients built with weston]),, + enable_demo_clients_install=no) +AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) PKG_CHECK_MODULES(LCMS, lcms2, [have_lcms=yes], [have_lcms=no]) @@ -475,28 +505,11 @@ if test x$wayland_scanner = x; then fi PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) -AC_PATH_PROG(XMLLINT, xmllint) -AC_ARG_WITH([dtddir], - AS_HELP_STRING([--with-dtddir], - [Directory containing the Wayland - protocol DTD @<:@default=from pkgconfig@:>@]), - [dtddir="$withval"], - [dtddir=$($PKG_CONFIG --variable=pkgdatadir wayland-scanner)]) -AC_SUBST([dtddir]) -AM_CONDITIONAL([HAVE_XMLLINT], [test "x$XMLLINT" != "x" -a "x$dtddir" != "x"]) - -AC_CONFIG_FILES([Makefile - shared/Makefile - src/Makefile - src/xwayland/Makefile - src/version.h - src/weston.pc - clients/Makefile - wcap/Makefile - data/Makefile - protocol/Makefile - man/Makefile - tests/Makefile]) + +AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) + +AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD]) + AC_OUTPUT AC_MSG_RESULT([ @@ -511,7 +524,7 @@ AC_MSG_RESULT([ dbus ${enable_dbus} Build wcap utility ${enable_wcap_tools} - Build Tablet Shell ${enable_tablet_shell} + Build Fullscreen Shell ${enable_fullscreen_shell} weston-launch utility ${enable_weston_launch} systemd-login support ${have_systemd_login} @@ -523,6 +536,9 @@ AC_MSG_RESULT([ RPI Compositor ${enable_rpi_compositor} FBDEV Compositor ${enable_fbdev_compositor} RDP Compositor ${enable_rdp_compositor} + Screen Sharing ${enable_screen_sharing} + + libinput Backend ${enable_libinput_backend} Raspberry Pi BCM headers ${have_bcm_host} @@ -531,7 +547,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 ${enable_demo_clients_install} Colord Support ${have_colord} GLU Support ${have_glu}