Updating changelog

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

diff --git a/configure.ac b/configure.ac
index 30c12b4..aa2caf5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([weston],
-        [0.94.90],
+        [0.95.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=weston],
         [weston],
         [http://wayland.freedesktop.org/])
@@ -14,6 +14,7 @@ AM_SILENT_RULES([yes])
 # Check for programs
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_SED
 
 # Initialize libtool
 LT_PREREQ([2.2])
@@ -97,15 +98,6 @@ if test x$enable_drm_compositor = xyes; then
 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
-  AC_DEFINE([BUILD_OPENWFD_COMPOSITOR], [1], [Build the OpenWF compositor])
-  PKG_CHECK_MODULES(OPENWFD_COMPOSITOR, [openwfd gbm])
-fi
-
-
 AC_ARG_ENABLE(wayland-compositor, [  --enable-wayland-compositor],,
              enable_wayland_compositor=yes)
 AM_CONDITIONAL(ENABLE_WAYLAND_COMPOSITOR,
@@ -124,6 +116,7 @@ AC_ARG_ENABLE(android-compositor,
 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])
+  PKG_CHECK_MODULES(ANDROID_COMPOSITOR, [mtdev >= 1.1.0])
 fi
 
 
@@ -141,12 +134,6 @@ 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])])
 
-PKG_CHECK_MODULES(CAIRO, [cairo])
-SHARED_LIBS="$CAIRO_LIBS $PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS"
-SHARED_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS"
-AC_SUBST(SHARED_LIBS)
-AC_SUBST(SHARED_CFLAGS)
-
 AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes)
 if test x$have_jpeglib = xyes; then
   IMAGE_LIBS="$IMAGE_LIBS -ljpeg"
@@ -154,6 +141,12 @@ else
   AC_ERROR([libjpeg not found])
 fi
 
+PKG_CHECK_MODULES(CAIRO, [cairo])
+SHARED_LIBS="$CAIRO_LIBS $PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS $IMAGE_LIBS"
+SHARED_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS"
+AC_SUBST(SHARED_LIBS)
+AC_SUBST(SHARED_CFLAGS)
+
 COMPOSITOR_LIBS="$COMPOSITOR_LIBS $IMAGE_LIBS"
 COMPOSITOR_CFLAGS="$COMPOSITOR_CFLAGS $IMAGE_CFLAGS"
 
@@ -171,6 +164,7 @@ 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 xkbcommon wayland-cursor])
+  PKG_CHECK_MODULES(WESTON_INFO, [wayland-client])
 
   CLIENT_CFLAGS="$CLIENT_CFLAGS $IMAGE_CFLAGS"
   CLIENT_LIBS="$CLIENT_LIBS $IMAGE_LIBS"
@@ -217,13 +211,15 @@ 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])
+  PKG_CHECK_MODULES(WCAP, [cairo])
   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
        my_common_gcc_flags="-Wall -Wextra -Wno-unused-parameter \
@@ -245,5 +241,6 @@ AC_CONFIG_FILES([Makefile
                 wcap/Makefile
                 data/Makefile
                 protocol/Makefile
+                man/Makefile
                 tests/Makefile])
 AC_OUTPUT