[PATCH xserver] Build glamor when Xorg or Xephyr are built.

[Hans de Goede]

Hi,

On 12-08-16 06:39, Keith Packard wrote:
> Requires gbm when building Xorg so that xf86-video-modesetting will
> work.
>
> Signed-off-by: Keith Packard <keithp at keithp.com>

Looks good to me:

Reviewed-by: Hans de Goede <hdegoede at redhat.com>

Regards,

Hans


> ---
>  configure.ac | 17 +++++++++++++++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 2b93a4a..e206e0f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -654,7 +654,7 @@ AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz
>  AC_ARG_ENABLE(xwayland,       AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto])
>  AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
>  AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
> -AC_ARG_ENABLE(glamor,         AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no])
> +AC_ARG_ENABLE(glamor,         AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: auto)]), [GLAMOR=$enableval], [GLAMOR=auto])
>  dnl kdrive and its subsystems
>  AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
>  AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
> @@ -2150,7 +2150,17 @@ AM_CONDITIONAL([XORG_BUS_PLATFORM], [test "x$CONFIG_UDEV_KMS" = xyes])
>  AM_CONDITIONAL([XORG_DRIVER_MODESETTING], [test "x$XORG_DRIVER_MODESETTING" = xyes])
>
>  dnl glamor
> +if test "x$GLAMOR" = xauto; then
> +	if test "x$XORG" = xyes; then
> +		GLAMOR=yes
> +	fi
> +	if test "x$XEPHYR" = xyes; then
> +		GLAMOR=yes
> +	fi
> +fi
> +
>  AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes])
> +
>  if test "x$GLAMOR" = xyes; then
>  	AC_DEFINE(GLAMOR, 1, [Build glamor])
>  	PKG_CHECK_MODULES([GLAMOR], [epoxy])
> @@ -2163,8 +2173,11 @@ if test "x$GLAMOR" = xyes; then
>  			[AC_DEFINE(GLAMOR_HAS_GBM_LINEAR, 1, [Have GBM_BO_USE_LINEAR])], [],
>  			[#include <stdlib.h>
>  			 #include <gbm.h>])
> +	else
> +		if test "x$XORG" = xyes; then
> +			AC_MSG_ERROR([Glamor for Xorg requires $LIBGBM])
> +		fi
>  	fi
> -
>  fi
>  AM_CONDITIONAL([GLAMOR_EGL], [test "x$GBM" = xyes])
>
>