diff options
author | Alon Levy <alevy@redhat.com> | 2011-08-26 16:51:14 +0300 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2011-08-26 16:51:14 +0300 |
commit | 77333a670916242b1a5d72c25f67106fd745374a (patch) | |
tree | b91ee9bde3e5cc1adddc925628be18e022173e08 | |
parent | 686bc6d8abc8bda2b384a76fc293bd6e2f82f96d (diff) |
configure: remote --enable-remote, use --with-gallium-drivers=remote insteadHEADspice_vgallium
-rw-r--r-- | configure.ac | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 90ffac5c7e..d7db32f560 100644 --- a/configure.ac +++ b/configure.ac @@ -621,11 +621,6 @@ AC_ARG_ENABLE([gallium_gbm], @<:@default=auto@:>@])], [enable_gallium_gbm="$enableval"], [enable_gallium_gbm=auto]) -AC_ARG_ENABLE([remote], - [AS_HELP_STRING([--enable-remote], - [enable remoting libGL @<:@default=auto@:>@])], - [enable_remote="$enableval"], - [enable_remote=no]) # Option for Gallium drivers GALLIUM_DRIVERS_DEFAULT="r300,r600,swrast" @@ -806,20 +801,6 @@ x*yes*) ;; esac -case "x$enable_remote$enable_glx$enable_xlib_glx" in -xyesnono|xyesnoyes|xyesyesyes) - echo "--enable-remote requires --enable-glx and no --enable-xlib-glx" - exit 1 - ;; -xyesyesno) - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/remote-xlib" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib-remote" - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS remote" - GALLIUM_STATE_TRACKERS_DIRS="glx $GALLIUM_STATE_TRACKERS_DIRS" - HAVE_WINSYS_XLIB="yes" - ;; -esac - case "x$enable_glx$enable_xlib_glx" in xyesyes) DRIVER_DIRS="$DRIVER_DIRS x11" @@ -1907,6 +1888,21 @@ if test "x$with_gallium_drivers" != x; then fi fi ;; + xremote) + case "x$enable_glx$enable_xlib_glx" in + xnono|xnoyes|xyesyes) + echo "remote requires --enable-glx and no --enable-xlib-glx" + exit 1 + ;; + xyesno) + GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/remote-xlib" + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib-remote" + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS remote" + GALLIUM_STATE_TRACKERS_DIRS="glx $GALLIUM_STATE_TRACKERS_DIRS" + HAVE_WINSYS_XLIB="yes" + ;; + esac + ;; *) AC_MSG_ERROR([Unknown Gallium driver: $driver]) ;; |