Switch to new acvmod

22 files changed, 112 insertions, 204 deletions

diff --git a/Makefile.am b/Makefile.am
index 9afba47..dc90c44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-# This file is part of vmod-variable
-# Copyright (C) 2013-2016 Sergey Poznyakoff
-#
-# Vmod-variable is free software; you can redistribute it and/or modify
+# This file is part of vmod_variable.
+# Copyright (C) 2017 Sergey Poznyakoff
+# 
+# Vmod_variable is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -7,4 +7,4 @@
 # any later version.
-#
-# Vmod-variable is distributed in the hope that it will be useful,
+# 
+# Vmod_variable is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,5 +12,6 @@
 # GNU General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU General Public License
-# along with vmod-variable.  If not, see <http://www.gnu.org/licenses/>.
+# along with vmod_variable.  If not, see <http://www.gnu.org/licenses/>.
+
 ACLOCAL_AMFLAGS = -I m4 -I acvmod
@@ -19,12 +20,4 @@ SUBDIRS = src tests
 
-AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir
-
-EXTRA_DIST=git2chg.awk
+include acvmod/top.am
 
-.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
 
diff --git a/acvmod b/acvmod
-Subproject f064cf4d7aa1ead1f8607b8b72baf883f015ffc
+Subproject 7cbce8ec30898fcc19e3ba25f367156a5859ea8
diff --git a/configure.ac b/configure.ac
index ca5c8f7..2f163d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,3 @@
 # This file is part of vmod-variable -*- autoconf -*-
-# Copyright (C) 2015-2016 Sergey Poznyakoff
+# Copyright (C) 2015-2017 Sergey Poznyakoff
 #
@@ -16,3 +16,3 @@
 AC_PREREQ(2.69)
-AC_INIT([vmod-variable], [1.0.90-4.1.0], [gray@gnu.org])
+AC_INIT([vmod-variable], [1.0.92], [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -51,3 +51,3 @@ AC_CHECK_LIB(pcre, pcre_compile,,
 
-AM_VARNISHAPI
+AM_VARNISHAPI([4.1])
              
diff --git a/git2chg.awk b/git2chg.awk
deleted file mode 100644
index 1e75254..0000000
--- a/git2chg.awk
+++ /dev/null
@@ -1,75 +0,0 @@
-# This file is part of grecs
-# Copyright (C) 2007, 2009-2012 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 5396773..bf5eee8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-# This file is part of vmod-variable
-# Copyright (C) 2015, 2016 Sergey Poznyakoff
-#
-# Vmod-variable is free software; you can redistribute it and/or modify
+# This file is part of vmod_variable.
+# Copyright (C) 2017 Sergey Poznyakoff
+# 
+# Vmod_variable is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -7,4 +7,4 @@
 # any later version.
-#
-# Vmod-variable is distributed in the hope that it will be useful,
+# 
+# Vmod_variable is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,14 +12,10 @@
 # GNU General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU General Public License
-# along with vmod-variable.  If not, see <http://www.gnu.org/licenses/>.
+# along with vmod_variable.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS=\
- -I$(VARNISHSRC)/include\
- -I$(VARNISHSRC)/bin/varnishd\
- -I$(VARNISHSRC)\
+ $(VARNISHAPI_CFLAGS)\
  -DLOCALSTATEDIR=\"$(localstatedir)\"
 
-dist_man_MANS=vmod-variable.3 vmod_variable.3
-
 vmoddir = $(VMODDIR)
@@ -40,3 +36,2 @@ CLEANFILES = vcc_if.c vcc_if.h *.rst
 
-vmodtool = $(VARNISHSRC)/lib/libvcc/vmodtool.py
 vmodtoolargs = --strict
@@ -44,7 +39,14 @@ vccfile = $(top_srcdir)/src/variable.vcc
 
-vcc_if.c vcc_if.h: $(vmodtool) $(vccfile)
-        $(AM_V_GEN)$(PYTHON) $(vmodtool) $(vmodtoolargs) $(vccfile)
+vcc_if.c vcc_if.h: $(vccfile)
+        $(AM_V_GEN)$(PYTHON) $(VARNISHAPI_VMODTOOL) $(vmodtoolargs) $(vccfile)
 
 EXTRA_DIST = \
-        variable.vcc
+        variable.vcc\
+        vmod_variable.man.rst\
+        vmod_variable.rst
+
+dist_man_MANS=vmod_variable.3 vmod-variable.3
+
+DISTCLEANFILES=vmod_variable.3
+
 
diff --git a/src/variable.c b/src/variable.c
index 8e75ea2..feaaa21 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1,3 +1,3 @@
 /* This file is part of vmod-variable
-   Copyright (C) 2013-2016 Sergey Poznyakoff
+   Copyright (C) 2013-2017 Sergey Poznyako