From 972830e1887ba1a5e31e4daf21d4b38ce7ef1dde Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 21 Feb 2020 14:41:34 -0800
Subject: [PATCH] configure: Improve libLLVM related; add default flags.

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

diff --git a/configure.ac b/configure.ac
index 6da1415b0..c6855c6a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1936,21 +1936,25 @@ AC_ARG_WITH(llvm-includes,
 AC_HELP_STRING([--with-llvm-includes=[[[DIR]]]], [Path to libllvm include directory]),
 [
 	LLVM_CPPFLAGS="-isystem $withval"
-], [])
+], [
+	LLVM_CPPFLAGS="-isystem /usr/include/llvm-9"
+])
 
 AC_ARG_WITH(llvm-libs,
 AC_HELP_STRING([--with-llvm-libs=[[[DIR]]]], [Path to libllvm library directory]),
 [
 	LLVM_LDFLAGS="-L$withval"
-], [])
+], [
+	LLVM_LDFLAGS="-L/usr/lib/llvm-9/lib"
+])
 
-AC_CHECK_LIB([LLVM-9], [LLVMBuildAnd],
+AC_CHECK_LIB([LLVM], [LLVMBuildAnd],
 [
 	have_libllvm="yes"
-	LLVM_LIBS="-lLLVM-9"
+	LLVM_LIBS="-lLLVM"
 ], [
 	have_libllvm="no"
-	AC_MSG_WARN([Unable to find LLVM-9 compiler infrastructure library on this system.])
+	AC_MSG_WARN([Unable to find LLVM compiler infrastructure library on this system.])
 ])
 
 AM_CONDITIONAL([LLVM], [test "x$have_libllvm" = "xyes" ])