Fix out of tree builds.

The paths to these files need to be fully specified in
the out of tree build case. glibc-2.X.supp is a generated file so the
full path is deliberately not specified in that case.

Also adjust the mpi include dir location as valgrind.h is
generated as well and needs to be taken out of build dir.

Also adjust the location of generated xml file. And the search paths
for the xmllint, xsltproc and xmlto programs.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>

diff --git a/NEWS b/NEWS
index d3bb86d0f69bcfaf88d289d5dc68678e2463de9c..1fa918dfbd854a8b968103797cf31f3fe7a028f9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 444925  fexecve syscall wrapper not properly implemented
 445032  valgrind/memcheck crash with SIGSEGV when SIGVTALRM timer used and
         libthr.so associated
+445211  Fix out of tree builds
 445300  [PATCH] Fix building tests with Musl
 445011  SIGCHLD is sent when valgrind uses debuginfod-find
 445354  arm64 backend: incorrect code emitted for doubleword CAS

diff --git a/configure.ac b/configure.ac
index 04c306efbbae30881e5a097f80a563b5c9698ac5..4bde7318cff469eed8be29dacc557ec714890dd7 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -454,7 +454,7 @@ case "${host_os}" in
            ;;
         esac
 
-        DEFAULT_SUPP="freebsd.supp freebsd-helgrind.supp freebsd-drd.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/freebsd.supp $srcdir/freebsd-helgrind.supp $srcdir/freebsd-drd.supp ${DEFAULT_SUPP}"
         ;;
 
      *darwin*)
@@ -493,56 +493,56 @@ case "${host_os}" in
             9.*)
                  AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}"
                  ;;
             10.*)
                  AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
             11.*)
                  AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
             12.*)
                  AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
             13.*)
                  AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
             14.*)
                  AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
             15.*)
                  AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
             16.*)
                  AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}"
+                  DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
             17.*)
                  AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra])
                  AC_DEFINE([DARWIN_VERS], DARWIN_10_13, [Darwin / Mac OS X version])
-                 DEFAULT_SUPP="darwin17.supp ${DEFAULT_SUPP}"
-                 DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
+                 DEFAULT_SUPP="$srcdir/darwin17.supp ${DEFAULT_SUPP}"
+                 DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
                  ;;
              *) 
                  AC_MSG_RESULT([unsupported (${kernel})])
@@ -558,10 +558,10 @@ case "${host_os}" in
         uname_v=$( uname -v )
         case "$uname_v" in
              11.4.*)
-                 DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
+                 DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}"
                  ;;
              *)
-                 DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}"
+                 DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}"
                  ;;
        esac
         ;;
@@ -569,7 +569,7 @@ case "${host_os}" in
      solaris2.12*)
         AC_MSG_RESULT([ok (${host_os})])
         VGCONF_OS="solaris"
-        DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}"
         ;;
 
      *) 
@@ -1283,15 +1283,15 @@ AC_MSG_CHECKING([the glibc version])
 case "${GLIBC_VERSION}" in
      2.2)
        AC_MSG_RESULT(${GLIBC_VERSION} family)
-       DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
        ;;
      2.[[3-6]])
        AC_MSG_RESULT(${GLIBC_VERSION} family)
-       DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
        ;;
      2.[[7-9]])
        AC_MSG_RESULT(${GLIBC_VERSION} family)
@@ -1304,8 +1304,8 @@ case "${GLIBC_VERSION}" in
        AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1,
                  [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)])
        DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
        ;;
      2.*)
        AC_MSG_RESULT(${GLIBC_VERSION} family)
@@ -1314,8 +1314,8 @@ case "${GLIBC_VERSION}" in
        AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1,
                  [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)])
        DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
-       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
        ;;
      darwin)
        AC_MSG_RESULT(Darwin)
@@ -1330,7 +1330,7 @@ case "${GLIBC_VERSION}" in
      bionic)
        AC_MSG_RESULT(Bionic)
        AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
-       DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}"
+       DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}"
        ;;
      solaris)
        AC_MSG_RESULT(Solaris)
@@ -1340,7 +1340,7 @@ case "${GLIBC_VERSION}" in
      musl)
        AC_MSG_RESULT(Musl)
        AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
-       DEFAULT_SUPP="musl.supp ${DEFAULT_SUPP}"
+       DEFAULT_SUPP="$srcdir/musl.supp ${DEFAULT_SUPP}"
        ;;
      2.0|2.1|*)
        AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
@@ -1359,8 +1359,8 @@ if test "$VGCONF_OS" != "solaris"; then
     # attempt to detect whether such libraries are installed on the
     # build machine (or even if any X facilities are present); just
     # add the suppressions antidisirregardless.
-    DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}"
-    DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
+    DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}"
+    DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}"
 fi
 
 

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5c777a263a342b7551149f6d1b81510954d789f6..3850d7b744d48c1bd7ed9f57640b6da35c56213c 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -124,11 +124,12 @@ LOGFILE = print.log
 
 # validation stuff
 XMLLINT       = xmllint
-XMLLINT_FLAGS = --noblanks --noout --xinclude --postvalid --noent
+XMLLINT_FLAGS = --noblanks --noout --xinclude --postvalid --noent \
+               --path $(top_builddir)/docs/xml
 
 # stylesheet processor
 XSLTPROC       = xsltproc
-XSLTPROC_FLAGS = --nonet --xinclude
+XSLTPROC_FLAGS = --nonet --xinclude --path $(top_builddir)/docs/xml
 
 # stylesheets
 XSL_HTML_CHUNK_STYLE  = $(mylibdir)/vg-html-chunk.xsl
@@ -143,7 +144,7 @@ XSL_MAN_STYLES = \
 
 # Input files for valid-manual and valid-manpages
 MANUAL_XML_FILES = $(myxmldir)/index.xml \
-                    $(myxmldir)/vg-entities.xml \
+                    $(top_builddir)/docs/xml/vg-entities.xml \
                     $(myxmldir)/quick-start-guide.xml \
                     $(myxmldir)/manual.xml \
                       $(myxmldir)/manual-intro.xml \
@@ -238,7 +239,8 @@ print-docs:
        cp $(myimgdir)/*.png $(myprintdir)/images && \
        xmlto -v $(WITH_FOP) --stringparam=keep.relative.image.uris="1" \
              -x $(XSL_FO_STYLE) \
-             --searchpath print pdf $(myxmldir)/index.xml &> $(LOGFILE) && \
+             --searchpath $(top_builddir)/docs/xml:print \
+             pdf $(myxmldir)/index.xml &> $(LOGFILE) && \
        echo "Generating PS file: $(myprintdir)/index.ps ..." && \
        pdftops index.pdf && \
        mv index.pdf index.ps $(myprintdir) && \
@@ -353,7 +355,8 @@ download-docs:
        cp $(myimgdir)/*.png $(vgdir)/print/images/
        xmlto -v $(WITH_FOP) --stringparam=keep.relative.image.uris="1" \
              -x $(XSL_FO_STYLE) \
-             --searchpath print pdf $(myxmldir)/index.xml &> $(LOGFILE)
+             --searchpath $(top_builddir)/docs/xml:print \
+             pdf $(myxmldir)/index.xml &> $(LOGFILE)
        mv index.pdf $(vgdir)/print/manual.pdf
        @echo ""
        @echo "Generating valgrind_manual.ps.bz2 ..."

diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index 69b69aa92539c4d141974c004c35e35dc4383e40..e57e5aa85cbc1e9c2e7b40e6b57440348904c284 100644 (file)
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -56,14 +56,14 @@ endif
 
 if BUILD_MPIWRAP_PRI
 libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES  = libmpiwrap.c
-libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = -I$(top_srcdir)/include
+libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = -I$(top_builddir)/include
 libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS   = \
        $(CFLAGS_MPI) $(MPI_FLAG_M3264_PRI) -Wno-deprecated-declarations
 libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS  = $(LDFLAGS_MPI)
 endif
 if BUILD_MPIWRAP_SEC
 libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES  = libmpiwrap.c
-libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = -I$(top_srcdir)/include
+libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = -I$(top_builddir)/include
 libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS   = \
        $(CFLAGS_MPI) $(MPI_FLAG_M3264_SEC) -Wno-deprecated-declarations
 libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS  = $(LDFLAGS_MPI)