From 86ffe388baf2666905033852cd940c60c69a1388 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Wed, 4 Nov 2009 18:04:04 +0000
Subject: [PATCH] - remove symlink command - define DUNE_COMMON_BIN to make
out-of-source builds work ... in general there is still some work to be done
[[Imported from SVN: r5693]]
---
configure.ac | 5 ++---
dune/common/test/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index ffa2e0537..606d44321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,15 +7,14 @@ AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([dune/common/stdstreams.cc])
AM_CONFIG_HEADER([config.h])
-# create symlink dune -> $top_srcdir
-DUNE_SYMLINK
# add configure flags needed to create log files for dune-autobuild
DUNE_AUTOBUILD_FLAGS
# check all dune dependecies and prerequisits
DUNE_CHECK_ALL
# preset variable to path such that #include <dune/...> works
-AC_SUBST([DUNE_COMMON_ROOT], '$(abs_top_builddir)')
+AC_SUBST([DUNE_COMMON_ROOT], '$(abs_top_srcdir)')
+AC_SUBST([DUNE_COMMON_BIN], '$(abs_top_srcdir)/bin/')
AC_SUBST([AM_CPPFLAGS], '-I$(top_srcdir)')
AC_SUBST([LOCAL_LIBS], '$(top_builddir)/dune/common/libcommon.la')
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index 5179a1c77..5e1d78078 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -15,7 +15,7 @@ TESTPROGS = parsetest test-stack arraylisttest smartpointertest \
float_cmp
# which tests to run
-COMPILE_XFAIL=$(DUNE_COMMON_ROOT)/bin/xfail-compile-tests
+COMPILE_XFAIL=$(DUNE_COMMON_BIN)/xfail-compile-tests
COMPILE_XFAIL_TESTS = genericiterator_compile_fail nullptr-test-fail static_assert_test
--
GitLab