diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-06-14 05:14:27 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-06-19 21:13:57 +0200 |
| commit | ad50abbac9b166b0fd10b3cf3c24eec32b366f6b (patch) | |
| tree | 9815601afcad65ba886f6e7a261d1e9e914d2d0a | |
| parent | d1f66a9424d087f81d0040aafde033bd5cb1ca72 (diff) | |
configure.ac: remove redundant option --enable-gallium-egl
We already have --enable-gallium, --enable-egl, and --with-state-trackers=egl.
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 69513c1c4e2..90171fae97d 100644 --- a/configure.ac +++ b/configure.ac @@ -1201,6 +1201,9 @@ if test "x$enable_egl" = xyes; then SRC_DIRS="$SRC_DIRS egl" EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread" EGL_DRIVERS_DIRS="" + GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl" + HAVE_ST_EGL="yes" + if test "$enable_static" != yes; then # build egl_glx when libGL is built if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then @@ -1470,26 +1473,6 @@ dnl dnl Gallium state trackers configuration dnl -AC_ARG_ENABLE([gallium-egl], - [AS_HELP_STRING([--enable-gallium-egl], - [enable gallium EGL state tracker @<:@default=auto@:>@])], - [enable_gallium_egl="$enableval"], - [enable_gallium_egl=auto]) -if test "x$enable_gallium_egl" = xauto; then - case "$mesa_driver" in - dri|no) - enable_gallium_egl=$enable_egl - ;; - *) - enable_gallium_egl=$enable_openvg - ;; - esac -fi -case "x$enable_egl$enable_gallium_egl" in -xnoyes) - AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL]) -esac - AC_ARG_WITH([state-trackers], [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@], [comma delimited state_trackers list, e.g. @@ -1522,11 +1505,6 @@ yes) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega" st_egl="yes" fi - - if test "$enable_gallium_egl" = yes; then - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl" - HAVE_ST_EGL="yes" - fi fi ;; *) @@ -1577,7 +1555,7 @@ yes) if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then AC_MSG_ERROR([--with-state-trackers specified but vega is missing]) fi - if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then + if test "x$HAVE_ST_EGL" != xyes; then AC_MSG_ERROR([--with-state-trackers specified but egl is missing]) fi ;; |