Switch to the new acvmod; remove the --with-varnish-source option; revamp the testsuite

6 files changed, 9 insertions, 97 deletions

diff --git a/Makefile.am b/Makefile.am
index 25d4db4..6704aa5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of vmod-sql
-# Copyright (C) 2013-2016 Sergey Poznyakoff
+# Copyright (C) 2013-2017 Sergey Poznyakoff
 #
 # Vmod-sql is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
@@ -14,17 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with vmod-sql.  If not, see <http://www.gnu.org/licenses/>.
 ACLOCAL_AMFLAGS = -I m4 -I acvmod
 
 SUBDIRS = src doc #tests
 
-AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir
-
-EXTRA_DIST=git2chg.awk
-
-.PHONY: ChangeLog
-ChangeLog:
-	$(AM_V_GEN)if test -d .git; then                                   \
-	  git log --pretty='format:%ct  %an  <%ae>%n%n%s%n%n%b%n' |        \
-            awk -f $(top_srcdir)/git2chg.awk > ChangeLog;  \
-        fi
+include acvmod/top.am
 
diff --git a/acvmod b/acvmod
-Subproject f064cf4d7aa1ead1f8607b8b72baf883f015ffc
+Subproject ba32780019480b89cd9d796b93a76cae6afe99a
diff --git a/configure.ac b/configure.ac
index c7188cb..8e4529f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # This file is part of vmod-sql -*- autoconf -*-
-# Copyright (C) 2013-2016 Sergey Poznyakoff
+# Copyright (C) 2013-2017 Sergey Poznyakoff
 #
 # Vmod-sql is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
@@ -11,13 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with vmod-sql.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.69)
-AC_INIT([vmod-sql], 1.0.90-4.1.0, [gray@gnu.org])
+AC_INIT([vmod-sql], 1.0.91, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod-sql.c)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_SYSTEM
diff --git a/git2chg.awk b/git2chg.awk
deleted file mode 100644
index 6dad87e..0000000
--- a/git2chg.awk
+++ /dev/null
@@ -1,75 +0,0 @@
-# This file is part of grecs
-# Copyright (C) 2007-2014 Sergey Poznyakoff
-#
-# Grecs is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# Grecs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
-
-BEGIN {
-  if (since)
-    split(since,since_a,"-")
-}
-
-function timeok(t,   a) {
-	if (!since)
-		return 1
-	split(t,a,"-")
-	if (a[1] < since_a[1])
-		return 0
-	if (a[1] > since_a[1])
-		return 1
-	if (a[2] < since_a[2])
-		return 0
-	if (a[2] > since_a[2])
-		return 1
-	return a[3] > since_a[3]
-}
-      
-/^[0-9]+ .* +<[^>]+>/ {
-	s = strftime("%F", $1)
-	if (!timeok(s))
-	  exit
-	sub(/^[0-9]+ +/,"")
-	if (s == datestr && author == $0)
-		next
-	datestr = s
-	author = $0
-	if (runlen) { runlen = 0; print "" }
-	printf("%s  %s\n", datestr, author)
-	next
-}
-/^Signed-off-by:/ { next }
-/^<unknown>$/ { next }
-NF==0 {
-	runlen++
-	next
-}
-{ if (runlen) { runlen = 0; print "" }
-  print "\t" $0 }
-
-END {
-	if (append) {
-		print ""
-		while ((getline < append) > 0) {
-			if (match($0, /^Local *Variables:/))
-				break
-			print
-		}
-	}
-	print "\f"
-	# Make sure Emacs won't recognize this line:
-	print "Local", "Variables:"
-	print "mode: change-log"
-	print "version-control: never"
-	print "buffer-read-only: t"
-	print "End:"
-}
diff --git a/src/Makefile.am b/src/Makefile.am
index 601e8f5..a171c55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of vmod-sql
-# Copyright (C) 2013-2016 Sergey Poznyakoff
+# Copyright (C) 2013-2017 Sergey Poznyakoff
 #
 # Vmod-sql is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
@@ -11,16 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with vmod-sql.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS = \
- -I$(VARNISHSRC)/include\
- -I$(VARNISHSRC)/bin/varnishd\
- -I$(VARNISHSRC)
+AM_CPPFLAGS = $(VARNISHAPI_CFLAGS)
 
 vmoddir = $(VMODDIR)
 vmod_LTLIBRARIES = libvmod_sql.la
 
 libvmod_sql_la_LDFLAGS = -module -export-dynamic -avoid-version
 libvmod_sql_la_LIBADD=@MYSQLLIBS@ @PGSQLLIBS@
@@ -42,15 +39,14 @@ if USE_PGSQL
 endif
 
 vmod-sql.lo: vcc_if.c vcc_if.h
 
 CLEANFILES = vcc_if.c vcc_if.h *.rst
 
-vmodtool = $(VARNISHSRC)/lib/libvcc/vmodtool.py
 vmodtoolargs = --strict
 vccfile = $(top_srcdir)/src/vmod.vcc
 
 vcc_if.c vcc_if.h: $(vmodtool) $(vccfile)
-	$(AM_V_GEN)$(PYTHON) $(vmodtool) $(vmodtoolargs) $(vccfile)
+	$(AM_V_GEN)$(PYTHON) $(VARNISHAPI_VMODTOOL) $(vmodtoolargs) $(vccfile)
 
 EXTRA_DIST = vmod.vcc
 
diff --git a/src/vmod-sql.c b/src/vmod-sql.c
index 3dbfe4b..689b0f7 100644
--- a/src/vmod-sql.c
+++ b/src/vmod-sql.c
@@ -1,8 +1,8 @@
 /* This file is part of vmod-sql
-   Copyright (C) 2013-2014 Sergey Poznyakoff
+   Copyright (C) 2013-2017 Sergey Poznyakoff
 
    Vmod-sql is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
@@ -19,13 +19,13 @@
 #include "wordsplit.h"
 #include "vcl.h"
 #include "vrt.h"
 #include "vcc_if.h"
 #include "pthread.h"
 
-#include "bin/varnishd/cache/cache.h"
+#include "cache/cache.h"
 #define WSPTR(s) ((s)->ws)
 
 static pthread_once_t thread_once = PTHREAD_ONCE_INIT;
 static pthread_key_t thread_key;
 
 void