From 6a7eaf9c8fee52e01e7a48cd7e4630453c033655 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 21 Jan 2016 11:29:53 +0100 Subject: Fix VPATH problem with older autoconf versions --- build/linux/Makefile.in | 2 +- build/linux/configure.ac | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3