diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-06-18 20:33:55 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-06-19 21:15:55 +0200 |
| commit | 1251e1df0f5d4bc81c80c4c2d61c0a5f9b8b759a (patch) | |
| tree | cacfcb2394cdc5dc446b9b35458856aca8a03053 /configure.ac | |
| parent | 9ba2907f2ed893da3da1345647e34a597dd6ed07 (diff) | |
configure.ac: add back --enable-gallium-egl
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 871b16e1ec7..70da9ee15f1 100644 --- a/configure.ac +++ b/configure.ac @@ -548,6 +548,13 @@ AC_ARG_ENABLE([egl], [disable EGL library @<:@default=enabled@:>@])], [enable_egl="$enableval"], [enable_egl=yes]) +AC_ARG_ENABLE([gallium_egl], + [AS_HELP_STRING([--enable-gallium-egl], + [enable optional EGL state tracker (not required + for EGL support in Gallium with OpenGL and OpenGL ES) + @<:@default=disable@:>@])], + [enable_gallium_egl="$enableval"], + [enable_gallium_egl=no]) # Option for Gallium drivers GALLIUM_DRIVERS_DEFAULT="r300,r600,swrast" @@ -1210,9 +1217,6 @@ 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="egl $GALLIUM_STATE_TRACKERS_DIRS" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl" - HAVE_ST_EGL="yes" if test "$enable_static" != yes; then # build egl_glx when libGL is built @@ -1246,6 +1250,22 @@ AC_SUBST([EGL_LIB_DEPS]) AC_SUBST([EGL_DRIVERS_DIRS]) dnl +dnl EGL Gallium configuration +dnl +if test "x$enable_gallium_egl" = xyes; then + if test "x$with_gallium_drivers" = x; then + AC_MSG_ERROR([cannot enable egl_gallium without Gallium]) + fi + if test "x$enable_egl" = xno; then + AC_MSG_ERROR([cannot enable egl_gallium without EGL]) + fi + + GALLIUM_STATE_TRACKERS_DIRS="egl $GALLIUM_STATE_TRACKERS_DIRS" + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl" + HAVE_ST_EGL="yes" +fi + +dnl dnl X.Org DDX configuration dnl if test "x$enable_xorg" = xyes; then @@ -1271,6 +1291,9 @@ if test "x$enable_openvg" = xyes; then if test "x$with_gallium_drivers" = x; then AC_MSG_ERROR([cannot enable OpenVG without Gallium]) fi + if test "x$enable_gallium_egl" = xno; then + AC_MSG_ERROR([cannot enable OpenVG without egl_gallium]) + fi EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)' VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS -lpthread" @@ -1787,7 +1810,7 @@ if test "$enable_egl" = yes; then egl_drivers="$egl_drivers builtin:egl_$d" done - if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then + if test "x$HAVE_ST_EGL" = xyes; then echo " EGL drivers: ${egl_drivers} egl_gallium" echo " EGL Gallium STs:$EGL_CLIENT_APIS" else |