From: Marco d'Itri <md@linux.it>
Subject: do not use vtest2
Forwarded: not-needed

vtest2 is currently distributed as a git submodule, which is not
compatible with modern git-centric Debian packaging.
This patch disables all uses of vtest2 to allow the package to build.
As a side-effect, the generated documentation will be incomplete.

--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AC_REVISION([$Id$])
 AC_INIT([Vinyl Cache], [trunk], [vinyl-dev@vinyl-cache.org], [vinyl-cache])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 if ! test -f "${srcdir}/bin/vinyltest/vtest2/src/vtc_main.c" ; then
+  echo \
   AC_MSG_ERROR([vtest2 seems to be missing, use "git clone --recursive" or "git submodule update --init"])
 fi
 AC_CONFIG_HEADERS([config.h])
--- a/vtc.am
+++ b/vtc.am
@@ -8,7 +8,7 @@
 ## The current assumption is that all the tests for the Makefile are VTCs
 ## and may be revisited if needed.
 
-VTC_LOG_DRIVER = $(top_builddir)/bin/vinyltest/vinyltest --verbose --in-tree
+VTC_LOG_COMPILER = true
 TEST_EXTENSIONS = .vtc
 
 check: vtc-check-tests
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -7,5 +7,4 @@ SUBDIRS = \
 	vinyllog \
 	vinylncsa \
 	vinylstat \
-	vinyltop \
-	vinyltest
+	vinyltop
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = $(SPHINX) -W -N
+SPHINXBUILD   = $(SPHINX) -N
 BUILDDIR      = build
 
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) $(builddir)
@@ -164,7 +164,9 @@ BUILT_SOURCES += include/vsl-tags.rst
 
 vtest2_src = $(top_srcdir)/bin/vinyltest/vtest2/src
 
-VTCSYN_SRC = \
+VTCSYN_SRC =
+
+NOT_VTCSYN_SRC = \
 	$(vtest2_src)/vtc.c \
 	$(vtest2_src)/vtc_barrier.c \
 	$(vtest2_src)/vtc_haproxy.c \
