From ca32ef0da082dff4e2d2c183ccf1767701c93d94 Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Sat, 2 Oct 2010 12:37:59 +0200
Subject: [PATCH] fix dependence on build isl

---
 Makefile.am  | 3 +++
 configure.in | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f769f21..0644b95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,9 @@ if BUNDLED_ISL
     MAYBE_ISL = isl
     ISL_LA = $(top_builddir)/isl/libisl.la
 endif
+if BUILD_ISL
+    ISL_LA = $(ISL_BUILDDIR)/libisl.la
+endif
 if BUNDLED_ISL_POLYLIB
     MAYBE_ISL_POLYLIB = isl-polylib
     ISL_POLYLIB_LA = $(top_builddir)/isl-polylib/libisl-polylib.la
diff --git a/configure.in b/configure.in
index 961e2db..bb743d5 100644
--- a/configure.in
+++ b/configure.in
@@ -166,6 +166,7 @@ AX_SUBMODULE(isl,build|bundled|system,bundled)
 
 AC_SUBST(ISL_CFLAGS)
 AC_SUBST(ISL_LIBS)
+AC_SUBST(ISL_BUILDDIR)
 case "$with_isl" in
 bundled)
 	ISL_CFLAGS="-I\$(top_srcdir)/isl/include -I\$(top_builddir)/isl/include"
@@ -173,9 +174,8 @@ bundled)
 	PACKAGE_CFLAGS_ISL='-I${prefix}/include/isl'
 	;;
 build)
-	with_isl_builddir=`echo @abs_builddir@ | $with_isl_builddir/config.status --file=-`
-	ISL_CFLAGS="-I$isl_srcdir/include -I$with_isl_builddir/include"
-	ISL_LIBS="$with_isl_builddir/libisl.la"
+	ISL_BUILDDIR=`echo @abs_builddir@ | $with_isl_builddir/config.status --file=-`
+	ISL_CFLAGS="-I$isl_srcdir/include -I$ISL_BUILDDIR/include"
 	PACKAGE_CFLAGS_ISL='-I${prefix}/include/isl'
 	;;
 system)
@@ -183,6 +183,7 @@ system)
 	PACKAGE_CFLAGS_ISL="$ISL_CFLAGS"
 esac
 AM_CONDITIONAL(BUNDLED_ISL, test $with_isl = bundled)
+AM_CONDITIONAL(BUILD_ISL, test $with_isl = build)
 
 AX_SUBMODULE(isl-polylib,build|bundled|system,bundled)
 
-- 
2.11.4.GIT