Index: Makefile.am
===================================================================
--- Makefile.am	(revision eb67b47635ef70468037882e93204c4624478aec)
+++ Makefile.am	(revision 2fbc9046c57b70f5d974d5e16526c57c055d25e5)
@@ -27,5 +27,5 @@
 	@ls $(config_file) || (echo "Missing config.data, re-run configure script again" && false)
 	@$(eval config_data = $(shell cat $(config_file)))
-	@echo "Configuring libcfa with '$(config_data)''"
+	@echo "Configuring libcfa ($(abs_top_srcdir)/libcfa/configure) with '$(config_data)' from $(shell pwd) / $(dir $@)"
 	@cd $(dir $@) && $(abs_top_srcdir)/libcfa/configure $(config_data)
 
@@ -34,5 +34,5 @@
 man1_MANS = doc/man/cfa.1
 
-EXTRA_DIST = LICENSE doc/man/cfa.1 libcfa/configure automake libcfa/Makefile.dist.am libcfa/Makefile.dist.in
+EXTRA_DIST = LICENSE doc/man/cfa.1 libcfa/configure libcfa/Makefile.dist.am libcfa/Makefile.dist.in
 
 debug=yes
Index: configure.ac
===================================================================
--- configure.ac	(revision eb67b47635ef70468037882e93204c4624478aec)
+++ configure.ac	(revision 2fbc9046c57b70f5d974d5e16526c57c055d25e5)
@@ -137,4 +137,7 @@
 		\'--enable-gprofiler=*) ;;
 		\'--disable-gprofiler) ;;
+
+		# skip this, it only causes problems
+		\'--srcdir=*) ;;
 
 		# append all other arguments to the sub configure arguments
Index: libcfa/Makefile.am
===================================================================
--- libcfa/Makefile.am	(revision eb67b47635ef70468037882e93204c4624478aec)
+++ libcfa/Makefile.am	(revision 2fbc9046c57b70f5d974d5e16526c57c055d25e5)
@@ -16,4 +16,4 @@
 
 AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names
-ACLOCAL_AMFLAGS  = -I ../automake
+ACLOCAL_AMFLAGS  = -I automake
 SUBDIRS = prelude src      # order important
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision eb67b47635ef70468037882e93204c4624478aec)
+++ libcfa/configure.ac	(revision 2fbc9046c57b70f5d974d5e16526c57c055d25e5)
@@ -4,6 +4,6 @@
 AC_PREREQ([2.68])
 AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
-AC_CONFIG_AUX_DIR([../automake])
-AC_CONFIG_MACRO_DIRS([../automake])
+AC_CONFIG_AUX_DIR([automake])
+AC_CONFIG_MACRO_DIRS([automake])
 AM_SILENT_RULES([yes])
 
Index: libcfa/prelude/Makefile.am
===================================================================
--- libcfa/prelude/Makefile.am	(revision eb67b47635ef70468037882e93204c4624478aec)
+++ libcfa/prelude/Makefile.am	(revision 2fbc9046c57b70f5d974d5e16526c57c055d25e5)
@@ -17,5 +17,5 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS  = -I ../automake
+ACLOCAL_AMFLAGS  = -I automake
 
 # put into lib for now
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision eb67b47635ef70468037882e93204c4624478aec)
+++ libcfa/src/Makefile.am	(revision 2fbc9046c57b70f5d974d5e16526c57c055d25e5)
@@ -17,5 +17,5 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS  = -I ../automake
+ACLOCAL_AMFLAGS  = -I automake
 
 include $(top_srcdir)/../tools/build/cfa.make
@@ -32,5 +32,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed inst_headers_src
-AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr -I$(srcdir)/concurrency $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@