Mesa (10.2): configure.ac: Compute LLVM_VERSION_PATCH using llvm-config

[Emil Velikov]

Module: Mesa
Branch: 10.2
Commit: 907da04eb62541c7d5a56113de8b95b98b28283e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=907da04eb62541c7d5a56113de8b95b98b28283e

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Thu Sep 25 12:55:40 2014 -0700

configure.ac: Compute LLVM_VERSION_PATCH using llvm-config

This is the only guaranteed way get the patch level for llvm,
since the define cannot always be found in config.h depending
on the version of llvm or the build system used.

CC: 10.2 10.3 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Jonathan Gray <jsg at jsg.id.au>
(cherry picked from commit ec566e0f169dac33814463e913e5d844a782c61e)

---

 configure.ac |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index c7212b7..9f940ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1631,11 +1631,10 @@ if test "x$enable_gallium_llvm" = xyes; then
         AC_COMPUTE_INT([LLVM_VERSION_MINOR], [LLVM_VERSION_MINOR],
             [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"])
 
-        dnl In LLVM 3.4.1 patch level was defined in config.h and not
-        dnl llvm-config.h
-        AC_COMPUTE_INT([LLVM_VERSION_PATCH], [LLVM_VERSION_PATCH],
-            [#include "${LLVM_INCLUDEDIR}/llvm/Config/config.h"],
-            LLVM_VERSION_PATCH=0) dnl Default if LLVM_VERSION_PATCH not found
+        LLVM_VERSION_PATCH=`echo $LLVM_VERSION | cut -d. -f3 | egrep -o '^[[0-9]]+'`
+        if test -z "$LLVM_VERSION_PATCH"; then
+            LLVM_VERSION_PATCH=0
+        fi
 
         if test -n "${LLVM_VERSION_MAJOR}"; then
             LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}"