mirror of
https://github.com/brl/mutter.git
synced 2024-11-10 07:56:14 -05:00
[build] Update the experimental features checks
Instead of blacklisting experimental features at the end we can explicitly mark backends and image backends near their checks and provide a summary at the end.
This commit is contained in:
parent
d743aeaa21
commit
ea82346e0d
23
configure.ac
23
configure.ac
@ -97,6 +97,8 @@ clutterbackend=glx
|
|||||||
clutter_gl_header=""
|
clutter_gl_header=""
|
||||||
glesversion=1.1
|
glesversion=1.1
|
||||||
use_gles2_wrapper=no
|
use_gles2_wrapper=no
|
||||||
|
experimental_backend=no
|
||||||
|
experimental_image=no
|
||||||
|
|
||||||
AC_ARG_WITH([flavour],
|
AC_ARG_WITH([flavour],
|
||||||
[AC_HELP_STRING([--with-flavour=@<:@glx/eglx/eglnative/sdl/osx/win32/fruity@:>@],
|
[AC_HELP_STRING([--with-flavour=@<:@glx/eglx/eglnative/sdl/osx/win32/fruity@:>@],
|
||||||
@ -209,6 +211,7 @@ AS_CASE([$clutterbackend],
|
|||||||
|
|
||||||
[sdl],
|
[sdl],
|
||||||
[
|
[
|
||||||
|
experimental_backend="yes"
|
||||||
clutter_gl_header="GL/gl.h"
|
clutter_gl_header="GL/gl.h"
|
||||||
CLUTTER_FLAVOUR="sdl"
|
CLUTTER_FLAVOUR="sdl"
|
||||||
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_SDL"
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_SDL"
|
||||||
@ -306,6 +309,7 @@ AS_CASE([$clutterbackend],
|
|||||||
|
|
||||||
[fruity],
|
[fruity],
|
||||||
[
|
[
|
||||||
|
experimental_backend="yes"
|
||||||
# the GL header is defined in the COGL checks above
|
# the GL header is defined in the COGL checks above
|
||||||
CLUTTER_FLAVOUR="fruity"
|
CLUTTER_FLAVOUR="fruity"
|
||||||
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY"
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY"
|
||||||
@ -317,6 +321,7 @@ AS_CASE([$clutterbackend],
|
|||||||
|
|
||||||
[osx],
|
[osx],
|
||||||
[
|
[
|
||||||
|
experimental_backend="yes"
|
||||||
clutter_gl_header="OpenGL/gl.h"
|
clutter_gl_header="OpenGL/gl.h"
|
||||||
CLUTTER_FLAVOUR="osx"
|
CLUTTER_FLAVOUR="osx"
|
||||||
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_OSX"
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_OSX"
|
||||||
@ -381,7 +386,10 @@ AC_ARG_WITH([imagebackend],
|
|||||||
AS_CASE([$imagebackend],
|
AS_CASE([$imagebackend],
|
||||||
|
|
||||||
[quartz],
|
[quartz],
|
||||||
[AC_DEFINE([USE_QUARTZ], 1, [Use Core Graphics (Quartz) for loading image data])],
|
[
|
||||||
|
experimental_image=yes
|
||||||
|
AC_DEFINE([USE_QUARTZ], 1, [Use Core Graphics (Quartz) for loading image data])
|
||||||
|
],
|
||||||
|
|
||||||
[gdk-pixbuf],
|
[gdk-pixbuf],
|
||||||
[
|
[
|
||||||
@ -390,7 +398,10 @@ AS_CASE([$imagebackend],
|
|||||||
],
|
],
|
||||||
|
|
||||||
[internal],
|
[internal],
|
||||||
[AC_DEFINE([USE_INTERNAL], 1, [Use internal image decoding for loading image data])],
|
[
|
||||||
|
experimental_image=yes
|
||||||
|
AC_DEFINE([USE_INTERNAL], 1, [Use internal image decoding for loading image data])
|
||||||
|
],
|
||||||
|
|
||||||
[AC_MSG_ERROR([Unknown argument for --with-imagebackend])]
|
[AC_MSG_ERROR([Unknown argument for --with-imagebackend])]
|
||||||
)
|
)
|
||||||
@ -827,12 +838,12 @@ echo ""
|
|||||||
# you can add more configuration options or flags that will bring up the
|
# you can add more configuration options or flags that will bring up the
|
||||||
# the experimental/unstable warning summary.
|
# the experimental/unstable warning summary.
|
||||||
|
|
||||||
if test "x$imagebackend" = "xinternal"; then
|
if test "x$experimental_backend" = "xyes"; then
|
||||||
experimental_stuff="$experimental_stuff imagebackend: $imagebackend\n"
|
experimental_stuff="$experimental_stuff Clutter backend: ${clutterbackend}\n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$clutterbackend" = "xfruity"; then
|
if test "x$experimental_image" = "xyes"; then
|
||||||
experimental_stuff="$experimental_stuff clutterbackend: $clutterbackend\n"
|
experimental_stuff="$experimental_stuff Image backend: ${imagebackend}\n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$experimental_stuff" != "x"; then
|
if test "x$experimental_stuff" != "x"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user