[Mesa-dev] [PATCH v2 06/17] configure.ac: move enable-gallium-llvm dependency with-gallium-drivers

[Tobias Droste]

Am Donnerstag, 9. Februar 2017, 20:53:06 CET schrieb Emil Velikov:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> ... to where it's applicable.
> 
> Since we effectively made --enable-gallium-llvm mean --enable-llvm with
> earlier commits, we need to move the requirement to guard the compnents
> added for the LLVM draw.
> 
> Otherwise we'll error (as below) when building RADV w/o gallium drivers.
> 
> configure: error: --enable-gallium-llvm is required when building radv
> 
> v2: Don't remove but move the dependency (Tobias).
> 
> Cc: Dave Airlie <airlied at redhat.com>
> CC: Tobias Droste <tdroste at gmx.de>
> Cc: "17.0" <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  configure.ac | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 4098da7666..2c7e95cf82 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1734,9 +1734,6 @@ AC_ARG_ENABLE([gallium-llvm],
>      [enable_gallium_llvm="$enableval"],
>      [enable_gallium_llvm=auto])
> 
> -if test -z "$with_gallium_drivers"; then
> -    enable_gallium_llvm=no
> -fi
>  if test "x$enable_gallium_llvm" = xauto; then
>      case "$host_cpu" in
>      i*86|x86_64|amd64) enable_gallium_llvm=yes;;
> @@ -2376,7 +2373,7 @@ if test -n "$with_gallium_drivers"; then
>      done
>  fi
> 
> -if test "x$enable_gallium_llvm" == "xyes"; then
> +if test "x$enable_gallium_llvm" == "xyes" -a "$with_gallium_drivers"; then

Does this actually work? Don't you need a -n for not empty string or != "" or 
something like this? Is a lonely string a valid expression?
If it works that way:
Reviewed-by: Tobias Droste <tdroste at gmx.de>

And btw: 
"x$enable_gallium_llvm" *==* "xyes" --> "x$enable_gallium_llvm" *=* "xyes"

before pushing this :-)

>      llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"
>      llvm_add_default_components "gallium"
>  fi