[Mesa-dev] [PATCH v2 2/2] configure.ac: Build dricommon when dri is enabled

[Stéphane Marchesin]

On Fri, Mar 8, 2013 at 12:58 PM, Matt Turner <mattst88 at gmail.com> wrote:
> Commit 67ef7559 added an || test "x$enable_dri" check in an attempt to
> get the DRI common bits built in some necessary cases. That change was
> inappropriate as it made these common DRI pieces be built
> unconditionally, so some builds were broken.
>
> Subsequently, commit 998d975e3 change the "|| test" to a "-a"
> conjunction within the existing test invocation. This made the '-a
> "x$enable_dri" = xyes' clause have no effect, (as it was inside an
> enclosing test for the same condition). So the new breakage from
> commit 67ef7559 was addressed, but the original problems were
> regressed.
>
> The immediately preceding commit removed the redundant condition.
>
> Now, finally this commit fixes the original problem as described in
> the commit message of 67ef7559: this code should be compiled when
> using the DRI state tracker. In order to do so, the HAVE_*_DRI
> conditionals must be moved after the last assignment of HAVE_COMMON_DRI.

Tested-by: Stéphane Marchesin <marcheu at chromium.org>

> ---
>  configure.ac |   19 ++++++++++---------
>  1 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 925dc6b..3204869 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1078,7 +1078,7 @@ if test "x$enable_dri" = xyes; then
>          [AC_MSG_ERROR([Expat required for DRI.])])
>      LIBS="$save_LIBS"
>
> -    # if we are building any dri driver other than swrast or using the dri state tracker ...
> +    # If we are building any DRI driver other than swrast.
>      if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast; then
>          # ... libdrm is required
>          if test "x$have_libdrm" != xyes; then
> @@ -1147,14 +1147,6 @@ case $DRI_DIRS in
>      ;;
>  esac
>
> -AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
> -AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
> -AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
> -AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
> -AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
> -AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
> -AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_COMMON_DRI = xyes)
> -
>  dnl
>  dnl OSMesa configuration
>  dnl
> @@ -1753,6 +1745,7 @@ gallium_check_st() {
>      fi
>      if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then
>           GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"
> +         HAVE_COMMON_DRI=yes
>      fi
>      if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then
>           GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"
> @@ -1994,6 +1987,14 @@ for driver in $GALLIUM_DRIVERS_DIRS; do
>      esac
>  done
>
> +AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
> +AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
> +AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
> +AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
> +AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
> +AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
> +AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_COMMON_DRI = xyes)
> +
>  AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes)
>  AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
>  AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes)
> --
> 1.7.8.6
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev