isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure: Clean up help and configuration summary

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-01-03 14:00:40 +00:00
parent f5fffb355b
commit e3511fcbac
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -317,14 +317,15 @@ AS_IF([test "x$enable_wayland" = "xyes"],
[BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-client xkbcommon"], [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-client xkbcommon"],
[]) [])
AC_DEFINE([HAVE_CLUTTER_WAYLAND], [1], [Have the Wayland backend]) AC_DEFINE([HAVE_CLUTTER_WAYLAND], [1], [Have the Wayland client backend])
]) ])
dnl Note this is orthogonal to the client side support and you can dnl Note this is orthogonal to the client side support and you can
dnl use the wayland compositor features with any of the clutter dnl use the Wayland compositor features with any of the clutter
dnl backends with corresponding Cogl support. dnl backends with corresponding Cogl support.
AC_ARG_ENABLE([wayland-compositor], AC_ARG_ENABLE([wayland-compositor],
[AS_HELP_STRING([--enable-wayland-compositor], [Enable Wayland compositor features])], [AS_HELP_STRING([--enable-wayland-compositor=@<:@yes/no@:>@],
[Enable Wayland compositor features (default=no)])],
[], [],
[AS_IF([test "x$SUPPORT_EGL" = "x1"], [AS_IF([test "x$SUPPORT_EGL" = "x1"],
[enable_wayland_compositor=yes], [enable_wayland_compositor=yes],
@ -338,8 +339,9 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"],
SUPPORT_WAYLAND_COMPOSITOR=1 SUPPORT_WAYLAND_COMPOSITOR=1
CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
#define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1" #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1"
AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have wayland compositor support]) AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support])
]) ])
AM_CONDITIONAL(SUPPORT_WAYLAND_COMPOSITOR, [test "x$SUPPORT_WAYLAND_COMPOSITOR" = "x1"]) AM_CONDITIONAL(SUPPORT_WAYLAND_COMPOSITOR, [test "x$SUPPORT_WAYLAND_COMPOSITOR" = "x1"])
AS_IF([test "x$enable_wayland_compositor" != "xyes" -a "x$enable_wayland" != "xyes"], AS_IF([test "x$enable_wayland_compositor" != "xyes" -a "x$enable_wayland" != "xyes"],
@ -357,7 +359,7 @@ AS_IF([test "x$enable_cex100" = "xyes"],
experimental_backend="yes" experimental_backend="yes"
SUPPORT_COGL=1 SUPPORT_COGL=1
SUPPORT_EGL_PLATFORM_GDL=1 SUPPORT_CEX100=1
have_gdl=no have_gdl=no
AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes]) AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes])
@ -483,7 +485,7 @@ AM_CONDITIONAL(SUPPORT_GDK, [test "x$SUPPORT_GDK" = "x1"])
AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "x1"]) AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "x1"])
AM_CONDITIONAL(SUPPORT_OSX, [test "x$SUPPORT_OSX" = "x1"]) AM_CONDITIONAL(SUPPORT_OSX, [test "x$SUPPORT_OSX" = "x1"])
AM_CONDITIONAL(SUPPORT_WIN32, [test "x$SUPPORT_WIN32" = "x1"]) AM_CONDITIONAL(SUPPORT_WIN32, [test "x$SUPPORT_WIN32" = "x1"])
AM_CONDITIONAL(SUPPORT_CEX100, [test "x$SUPPORT_EGL_PLATFORM_GDL" = "x1"]) AM_CONDITIONAL(SUPPORT_CEX100, [test "x$SUPPORT_CEX100" = "x1"])
AM_CONDITIONAL(SUPPORT_WAYLAND, [test "x$SUPPORT_WAYLAND" = "x1"]) AM_CONDITIONAL(SUPPORT_WAYLAND, [test "x$SUPPORT_WAYLAND" = "x1"])
AM_CONDITIONAL(SUPPORT_STUB, [test "x$SUPPORT_WIN32" = "x1" -o \ AM_CONDITIONAL(SUPPORT_STUB, [test "x$SUPPORT_WIN32" = "x1" -o \
"x$SUPPORT_OSX" = "x1"]) "x$SUPPORT_OSX" = "x1"])
@ -537,7 +539,7 @@ AS_IF([test "x$SUPPORT_WIN32" = "x1"],
[CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES [CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
#define CLUTTER_WINDOWING_WIN32 \"win32\" #define CLUTTER_WINDOWING_WIN32 \"win32\"
#define CLUTTER_INPUT_WIN32 \"win32\""]) #define CLUTTER_INPUT_WIN32 \"win32\""])
AS_IF([test "x$SUPPORT_EGL_PLATFORM_GDL" = "x1"], AS_IF([test "x$SUPPORT_CEX100" = "x1"],
[CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES [CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
#define CLUTTER_WINDOWING_CEX100 \"cex100\""]) #define CLUTTER_WINDOWING_CEX100 \"cex100\""])
AS_IF([test "x$SUPPORT_EVDEV" = "x1"], AS_IF([test "x$SUPPORT_EVDEV" = "x1"],
@ -1142,11 +1144,14 @@ fi
if test "x$SUPPORT_CEX100" = "x1"; then if test "x$SUPPORT_CEX100" = "x1"; then
echo "" echo ""
echo " - CEx100 backend options:" echo " - CEx100 backend options (WARNING: Experimental):"
echo " libGDL include prefix: ${CLUTTER_CEX100_LIBGDL_PREFIX}" echo " libGDL include prefix: ${CLUTTER_CEX100_LIBGDL_PREFIX}"
fi fi
echo " Wayland compositor features: ${SUPPORT_WAYLAND_COMPOSITOR}" if test "x$SUPPORT_WAYLAND_COMPOSITOR" = "x1"; then
echo ""
echo " - Wayland compositor support enabled (WARNING: Experimental)"
fi
echo "" echo ""