summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-01-21 11:29:53 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-01-21 11:29:53 +0100
commit6a7eaf9c8fee52e01e7a48cd7e4630453c033655 (patch)
treeee441dc41b25ac6fc7ad0b835917984fc4148187 /build
parent2b0177d66197cb613eed2dabe463b9486428a3e3 (diff)
downloadastra-6a7eaf9c8fee52e01e7a48cd7e4630453c033655.tar.gz
astra-6a7eaf9c8fee52e01e7a48cd7e4630453c033655.tar.bz2
astra-6a7eaf9c8fee52e01e7a48cd7e4630453c033655.tar.xz
astra-6a7eaf9c8fee52e01e7a48cd7e4630453c033655.zip
Fix VPATH problem with older autoconf versions
Diffstat (limited to 'build')
-rw-r--r--build/linux/Makefile.in2
-rw-r--r--build/linux/configure.ac6
2 files changed, 7 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 8398e35..3018674 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -24,7 +24,7 @@ exec_prefix=@exec_prefix@
srcdir=@srcdir@
abs_top_builddir=@abs_top_builddir@
-VPATH=$(srcdir)/../..
+VPATH=@VPATH_SRCDIR@/../..
CPPFLAGS=@SAVED_CPPFLAGS@
CXXFLAGS=@SAVED_CXXFLAGS@
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 5a04509..630b08d 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -243,6 +243,12 @@ esac
AC_SUBST(CPPFLAGS_OS)
+# For some reason, some older versions of autoconf produce a config.status
+# that disables all lines looking like VPATH=@srcdir@
+# (More recent autoconf fixes the too broad matching there.)
+# We use a different variable name as a workaround.
+VPATH_SRCDIR="$srcdir"
+AC_SUBST(VPATH_SRCDIR)
# TODO: