configure.ac: correctly manage llvm auto-detection
authorEmil Velikov <emil.velikov@collabora.com>
Wed, 18 Jan 2017 13:54:04 +0000 (13:54 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Fri, 10 Feb 2017 11:47:24 +0000 (11:47 +0000)
Earlier refactoring commits changed from one, dare I say it, broken
behaviour to another. Namely:

Before, as you explicitly --enable-gallium-llvm your selection was
ignored when llvm-config was not present/detected.
Today, the "auto" heuristics enables gallium llvm regardless if you have
llvm/llvm-config available or not.

Rework the auto-detection to attribute for llvm's presence.

v2: Set enable_gallium_llvm=no when LLVM is not found.

Cc: "17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Tobias Droste <tdroste@gmx.de>
Reported-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Tested-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
configure.ac

index 1251b83c40869320bc1e7bd56e7f35645c9d4fa7..af0a3fb9256b63a2bb56dfcc0edae7b3d9bac542 100644 (file)
@@ -1729,10 +1729,14 @@ AC_ARG_ENABLE([gallium-llvm],
     [enable_gallium_llvm=auto])
 
 if test "x$enable_gallium_llvm" = xauto; then
-    case "$host_cpu" in
-    i*86|x86_64|amd64) enable_gallium_llvm=yes;;
-    *) enable_gallium_llvm=no;;
-    esac
+    if test "x$FOUND_LLVM" = xyes; then
+        case "$host_cpu" in
+        i*86|x86_64|amd64) enable_gallium_llvm=yes;;
+        *) enable_gallium_llvm=no;;
+        esac
+    else
+        enable_gallium_llvm=no
+    fi
 fi
 
 if test "x$enable_gallium_llvm" = xyes -a "x$FOUND_LLVM" = xno; then