From 5cf37adb380b4ddf819951913c4d3044071f7e6b Mon Sep 17 00:00:00 2001
From: Victor Westerhuis <victor@westerhu.is>
Date: Fri, 3 Dec 2021 14:41:24 +0100
Subject: Make tests buildable in out-of-tree build

Let libtool take care of the linking. Prefer linking to libcolm
statically, like before. Add explicit include paths for files included
from the corresponding source directory.
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 230805b4..9248bc63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_PROG_CXX
 AC_CHECK_TOOL(AR, ar)
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL
+AC_PROG_LN_S
 
 SED_SUBST=["\
 	-e 's|@CXX@|${CXX}|g' \
@@ -186,7 +187,7 @@ AC_ARG_WITH(subject,
 		SUBJ_RAGEL_JULIA_BIN="$withval/bin/ragel-julia"
 	],
 	[
-		SUBJ_AAPL_CPPFLAGS='-I$(abs_top_builddir)/src/aapl'
+		SUBJ_AAPL_CPPFLAGS='-I$(abs_top_srcdir)/src/aapl'
 
 		SUBJ_COLM_BIN='$(abs_top_builddir)/src/colm'
 		SUBJ_COLM_CPPFLAGS='-I$(abs_top_builddir)/src/include'
-- 
cgit v1.2.1