[gnome-builder] build: allow building with llvm 4.0 and svn trunk

[Christian Hergert <chergert src gnome org>]

commit 903498bd6bb4f53ace2a2e85be22764138d28b57
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sun May 7 23:10:40 2017 +0800

    build: allow building with llvm 4.0 and svn trunk
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782296

 plugins/clang/configure.ac |    2 +-
 plugins/clang/meson.build  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/plugins/clang/configure.ac b/plugins/clang/configure.ac
index 1a9add9..6a3ac28 100644
--- a/plugins/clang/configure.ac
+++ b/plugins/clang/configure.ac
@@ -17,7 +17,7 @@ AS_IF([test "$enable_clang_plugin" != "no"],[
                llvm-config-3.7 llvm-config37 \
                llvm-config-3.6 llvm-config36 \
                llvm-config-3.5 llvm-config35 \
-               llvm-config-devel], [])
+               llvm-config-5.0 llvm-config-devel], [])
        AS_IF([test "x$LLVM_CONFIG" = "x"],[],[
                CLANG_INCLUDEDIR=`$LLVM_CONFIG --includedir`
                CLANG_CFLAGS="-I$CLANG_INCLUDEDIR"
diff --git a/plugins/clang/meson.build b/plugins/clang/meson.build
index 8d36fb6..69bb314 100644
--- a/plugins/clang/meson.build
+++ b/plugins/clang/meson.build
@@ -28,12 +28,13 @@ clang_sources = [
 
 llvm_config = find_program(
   'llvm-config',
+  'llvm-config-4.0', 'llvm-config40',
   'llvm-config-3.9', 'llvm-config39',
   'llvm-config-3.8', 'llvm-config38',
   'llvm-config-3.7', 'llvm-config37',
   'llvm-config-3.6', 'llvm-config36',
   'llvm-config-3.5', 'llvm-config35',
-  'llvm-config-4.0', 'llvm-config-devel',
+  'llvm-config-5.0', 'llvm-config-devel',
 )
 
 ret = run_command(llvm_config, '--includedir')