[Mesa-dev] [PATCH 3/3] configure.ac: Simplify DUSE_EXTERNAL_DXTN_LIB logic.

[Kristian Høgsberg]

On Tue, Jun 10, 2014 at 07:37:44PM -0700, Matt Turner wrote:

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>


> ---
>  configure.ac | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 17e9e9c..4b27455 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -149,7 +149,7 @@ _SAVE_LDFLAGS="$LDFLAGS"
>  _SAVE_CPPFLAGS="$CPPFLAGS"
>  
>  dnl Compiler macros
> -DEFINES=""
> +DEFINES="-DUSE_EXTERNAL_DXTN_LIB=1"
>  AC_SUBST([DEFINES])
>  case "$host_os" in
>  linux*|*-gnu*|gnu*)
> @@ -1077,7 +1077,6 @@ if test "x$enable_dri" = xyes; then
>      # Platform specific settings and drivers to build
>      case "$host_os" in
>      linux*)
> -        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1"
>          DEFINES="$DEFINES -DHAVE_ALIAS"
>          if test "x$enable_dri3" = xyes; then
>              DEFINES="$DEFINES -DHAVE_DRI3"
> @@ -1097,24 +1096,19 @@ if test "x$enable_dri" = xyes; then
>          esac
>          ;;
>      *freebsd* | dragonfly* | *netbsd* | openbsd*)
> -        DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1"
> +        DEFINES="$DEFINES -DHAVE_PTHREAD"
>          DEFINES="$DEFINES -DHAVE_ALIAS"
>          ;;
>      gnu*)
> -        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1"
>          DEFINES="$DEFINES -DHAVE_ALIAS"
>          ;;
> -    solaris*)
> -        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1"
> -        ;;
>      cygwin*)
> -        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1"
>          if test "x$with_dri_drivers" = "xyes"; then
>              with_dri_drivers="swrast"
>          fi
>          ;;
>      darwin*)
> -        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DGLX_ALIAS_UNSUPPORTED"
> +        DEFINES="$DEFINES -DGLX_ALIAS_UNSUPPORTED"
>          if test "x$with_dri_drivers" = "xyes"; then
>              with_dri_drivers="swrast"
>          fi
> -- 
> 1.8.3.2
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev