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

vtest2 is currently distributed as a git submodule, which is not
compatible with modern git-centric Debian packaging.
This patch builds Vinyl Cache using an external copy of the vtest2
source from the vtest2-source package.

--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,8 @@ AC_REVISION([$Id$])
 AC_INIT([Vinyl Cache], [9.0.1], [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
-  AC_MSG_ERROR([vtest2 seems to be missing, use "git clone --recursive" or "git submodule update --init"])
+  mkdir -p "${srcdir}/bin/vinyltest/vtest2/"
+  cp -aR /usr/src/vtest2/* "${srcdir}/bin/vinyltest/vtest2/"
 fi
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,7 @@ install-data-local:
 	$(install_sh) -d -m 0755 "$(DESTDIR)/${VINYL_STATE_DIR}"
 
 distclean-local:
+	rm -rf $(srcdir)/bin/vinyltest/vtest2/
 	-find . '(' -name '*.gcda' -o -name '*.gcda' ')' -exec rm '{}' ';'
 
 distcleancheck_listfiles = \
