Varnish 4.1

* .gitmodules: New file.
* acvmod: New submodule.
* bootstrap: Update.
* Makefile.am (ACLOCAL_AMFLAGS): Add acvmod
* configure.ac: Use AM_VARNISHAPI instead of inlining
the related code.
Enable silent rules.
Set version number 2.0.90-4.1.0
* src/Makefile.am: Enable silent rules.
* tests/Makefile.am: Likewise.
* tests/atlocal.in (at_vcl_backend): Remove conditional.

* src/vmod_dbrw.c: Use event function.
* src/vmod_dbrw.vcc: Likewise.

* NEWS: Document changes.

1 files changed, 7 insertions, 65 deletions

diff --git a/configure.ac b/configure.ac
index d16c555..f0eb02e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of vmod-dbrw -*- autoconf -*-
-# Copyright (C) 2013-2014 Sergey Poznyakoff
+# Copyright (C) 2013-2014, 2016 Sergey Poznyakoff
 #
 # Vmod-dbrw is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with vmod-dbrw.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.69)
-AC_INIT([vmod-dbrw], 2.0, [gray@gnu.org])
+AC_INIT([vmod-dbrw], 2.0.90-4.1.0, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_dbrw.vcc)
@@ -23,7 +23,8 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 AC_LANG(C)
 
-AM_INIT_AUTOMAKE([gnu tar-ustar])
+AM_INIT_AUTOMAKE([gnu tar-ustar silent-rules])
+AM_SILENT_RULES([yes])
 
 AC_GNU_SOURCE
 AC_PROG_CC
@@ -37,69 +38,11 @@ AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 
-# Check for pkg-config
-PKG_PROG_PKG_CONFIG
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/stdlib.h])
 
-# Check for python
-AC_CHECK_PROGS(PYTHON, [python], [
-	AC_MSG_ERROR([python is not found.])])
-
-# Varnish source tree
-AC_ARG_VAR([VARNISHSRC], [path to Varnish source tree])
-AC_ARG_WITH([varnish-source],
-            AC_HELP_STRING([--with-varnish-source=DIR],
-	                   [Varnish sources are located in DIR]),
-	    [VARNISHSRC=$withval])
-
-if test -z "$VARNISHSRC"; then
-	AC_MSG_ERROR([no Varnish source tree specified])
-fi
-case "$VARNISHSRC" in
-/*) ;;
-*)  AC_MSG_ERROR([varnish source path must be absolute pathname])
-esac
-
-VARNISHSRC=`cd $VARNISHSRC && pwd`
-VARNISHVERSION=
-AC_CHECK_FILE([$VARNISHSRC/include/varnishapi.h],
-  [VARNISHVERSION=3],
-  [AC_CHECK_FILE([$VARNISHSRC/include/vapi/vsm.h],
-     [VARNISHVERSION=4],
-     [AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])]) ])
-
-AC_DEFINE_UNQUOTED([VARNISHVERSION],$VARNISHVERSION,[Varnish major version number])
-AC_SUBST([VARNISHVERSION])
-AM_CONDITIONAL([VARNISH3],[test $VARNISHVERSION -eq 3])
-AM_CONDITIONAL([VARNISH4],[test $VARNISHVERSION -eq 4])
-     
-# Check that varnishtest is built in the varnish source directory
-AC_CHECK_FILE([$VARNISHSRC/bin/varnishtest/varnishtest],
-  [],
-  [AC_MSG_FAILURE([cannot find "$VARNISHSRC/bin/varnishtest/varnishtest". Please build your varnish source directory])]
-)
-
-# vmod installation dir
-AC_ARG_VAR([VMODDIR],  [vmod installation directory])
-AC_ARG_WITH([vmoddir],
-  AC_HELP_STRING([--with-vmoddir=DIR],
-                 [install modules to DIR]),
-  [case "$withval" in
-   /*)   VMODDIR=$withval;;
-   no)   unset VMODDIR;;
-   *)    AC_MSG_ERROR([argument to --with-vmoddir must be absolute pathname])
-   esac],[VMODDIR=`pkg-config --variable=vmoddir varnishapi`
-   if test -z "$VMODDIR"; then
-	AC_MSG_FAILURE([cannot determine vmod installation directory])
-   fi])
-
-
-if test -z "$VMODDIR"; then
-       VMODDIR='$(libdir)/varnish/mods'
-fi
+AM_VARNISHAPI
 
 ###########
 # Check for SQL support	      
@@ -161,11 +104,10 @@ AC_SUBST(PGSQLLIBS)
 AM_CONDITIONAL([USE_MYSQL],[test $build_mysql = yes])
 AM_CONDITIONAL([USE_PGSQL],[test $build_pgsql = yes])
 
-AC_CONFIG_COMMANDS([status],[
+AC_CONFIG_COMMANDS([sqlstatus],[
 echo ""
 delim="-------------------------------------------------------------------"
 echo $delim | tr '-' '*'
-echo "Building for Varnish version $VARNISHVERSION"
 echo "Backends to build:"
 res=
 for module in mysql pgsql
@@ -182,7 +124,7 @@ case "$res" in
 *)
        AC_MSG_ERROR([Nothing to build?])
 esac
-],[VARNISHVERSION=$VARNISHVERSION
+],[
 build_pgsql=$build_pgsql
 build_mysql=$build_mysql])