From 16c86bd3d8ba92c50fc96efb5a39a7725a16d785 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 27 Sep 2013 17:47:14 -0400 Subject: glamor: enable Xv by default Also move the configure option out of the middle of the debug option handling. Signed-off-by: Alex Deucher Reviewed-by: Zhigang Gong --- configure.ac | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e4838f4..2983394 100644 --- a/configure.ac +++ b/configure.ac @@ -91,15 +91,14 @@ AC_MSG_CHECKING([whether to include GLAMOR_GLES2 support]) AC_ARG_ENABLE(glamor-gles2, AS_HELP_STRING([--enable-glamor-gles2], [Build glamor based on gles2 (default: no)]), [GLAMOR_GLES2="$enableval"], [GLAMOR_GLES2=no]) AC_MSG_RESULT([$GLAMOR_GLES2]) -AC_MSG_CHECKING([whether to enable DEBUG]) -AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Build debug version glamor (default: no)]), [DEBUG="$enableval"], [DEBUG=no]) -AC_MSG_RESULT([$DEBUG]) - AC_MSG_CHECKING([whether to include GLAMOR Xv support]) -AC_ARG_ENABLE(xv, AS_HELP_STRING([--enable-xv], [Build glamor Xv (default: no)]), [GLAMOR_XV="$enableval"], [GLAMOR_XV=no]) +AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Disable glamor Xv (default: enabled)]), [GLAMOR_XV="$enableval"], [GLAMOR_XV=yes]) AC_MSG_RESULT([$GLAMOR_XV]) -AM_CONDITIONAL([GLAMOR_XV], [test "x$GLAMOR_XV" = xyes]) +AM_CONDITIONAL([GLAMOR_XV], [test "x$GLAMOR_XV" != xno]) +AC_MSG_CHECKING([whether to enable DEBUG]) +AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Build debug version glamor (default: no)]), [DEBUG="$enableval"], [DEBUG=no]) +AC_MSG_RESULT([$DEBUG]) if test "x$DEBUG" = xyes; then AC_DEFINE(DEBUG, 1, [Enable DEBUG]) fi -- cgit v1.2.3