window.c: Handle losing selection data source

[profile/ivi/weston.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d4e596c..d8865f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AM_SILENT_RULES([yes])
 
 # Check for programs
 AC_PROG_CC
+AC_PROG_CXX
 
 # Initialize libtool
 LT_PREREQ([2.2])
@@ -24,24 +25,23 @@ AC_CHECK_FUNC([dlopen], [],
               AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
 AC_SUBST(DLOPEN_LIBS)
 
+AC_CHECK_HEADERS([execinfo.h])
+
 PKG_CHECK_MODULES(COMPOSITOR,
                  [wayland-server egl >= 7.10 glesv2 xkbcommon pixman-1])
 
-AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
-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)
 
 
-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
-  PKG_CHECK_MODULES([XSERVER_LAUNCHER], xcb xcb-xfixes cairo-xcb)
-  AC_DEFINE([BUILD_XSERVER_LAUNCHER], [1], [Build the X server launcher])
+AC_ARG_ENABLE(xwayland, [  --enable-xwayland],,
+             enable_xwayland=yes)
+AM_CONDITIONAL(ENABLE_XWAYLAND, test x$enable_xwayland = xyes)
+if test x$enable_xwayland = xyes; then
+  PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes cairo-xcb)
+  AC_DEFINE([BUILD_XWAYLAND], [1], [Build the X server launcher])
 
   AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH],
               [Path to X server]), [XSERVER_PATH="$withval"],
@@ -96,6 +96,17 @@ if test x$enable_wayland_compositor = xyes; then
   PKG_CHECK_MODULES(WAYLAND_COMPOSITOR, [wayland-client wayland-egl])
 fi
 
+
+AC_ARG_ENABLE(android-compositor,
+             AS_HELP_STRING([--disable-android-compositor],
+                            [do not build-test the Android 4.0 backend]),,
+             enable_android_compositor=yes)
+AM_CONDITIONAL(ENABLE_ANDROID_COMPOSITOR, test x$enable_android_compositor = xyes)
+if test x$enable_android_compositor = xyes; then
+  AC_DEFINE([BUILD_ANDROID_COMPOSITOR], [1], [Build the compositor for Android 4.0])
+fi
+
+
 AC_ARG_WITH(cairo-glesv2, AS_HELP_STRING([--with-cairo-glesv2],
               [Use GLESv2 cairo instead of full GL]),
               [cairo_modules="cairo-glesv2"],
@@ -181,6 +192,19 @@ AC_ARG_ENABLE(tablet-shell, [  --enable-tablet-shell],,
 AM_CONDITIONAL(ENABLE_TABLET_SHELL,
               test x$enable_tablet_shell = xyes)
 
+
+AC_ARG_ENABLE(wcap-tools, [  --disable-wcap-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])
+  PKG_CHECK_MODULES(WCAP, [cairo vpx])
+  WCAP_LIBS="$WCAP_LIBS -lm"
+fi
+
+AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
+AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT")
+
+
 if test "x$GCC" = "xyes"; then
        GCC_CFLAGS="-Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
                -Wno-unused-parameter -Wno-missing-field-initializers \
@@ -196,6 +220,7 @@ AC_CONFIG_FILES([Makefile
                 src/Makefile
                 src/xwayland/Makefile
                 clients/Makefile
+                wcap/Makefile
                 data/Makefile
                 protocol/Makefile
                 tests/Makefile])