diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | NEWS | 11 | ||||
m--------- | acvmod | 0 | ||||
-rwxr-xr-x | bootstrap | 2 | ||||
-rw-r--r-- | configure.ac | 99 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/variable.c | 10 | ||||
-rw-r--r-- | src/variable.vcc | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 10 |
10 files changed, 34 insertions, 111 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..00ae21c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "acvmod"] + path = acvmod + url = git://git.gnu.org.ua/acvmod.git diff --git a/Makefile.am b/Makefile.am index 4111605..9afba47 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # This file is part of vmod-variable -# Copyright (C) 2013-2014 Sergey Poznyakoff +# Copyright (C) 2013-2016 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 @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with vmod-variable. If not, see <http://www.gnu.org/licenses/>. -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I acvmod SUBDIRS = src tests @@ -1,13 +1,18 @@ -vmod-variable -- history of user-visible changes. 2016-01-15 +vmod-variable -- history of user-visible changes. 2016-01-23 Copyright (C) 2015-2016 Sergey Poznyakoff See the end of file for copying conditions. Please send vmod-variable bug reports to <gray@gnu.org> -Version 1.0.90, (Git) +Version 1.0.90-4.1.0, (Git) -Fix coredumps. +* Versioning changes + +Starting with this release, the version number includes version +of Varnish API the release was designed for. + +* Support for Varnish 4,1 Version 1.0, 2015-02-16 diff --git a/acvmod b/acvmod new file mode 160000 +Subproject f064cf4d7aa1ead1f8607b8b72baf883f015ffc @@ -4,4 +4,6 @@ do test -d $dir || mkdir $dir done test -f ChangeLog || touch ChangeLog +git submodule init +git submodule update autoreconf -f -i -s diff --git a/configure.ac b/configure.ac index 4f328e7..ca5c8f7 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with vmod-variable. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.69) -AC_INIT([vmod-variable], [1.0.90], [gray@gnu.org]) +AC_INIT([vmod-variable], [1.0.90-4.1.0], [gray@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/variable.vcc) @@ -23,13 +23,14 @@ AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM AC_LANG(C) -AM_INIT_AUTOMAKE([1.14 gnu tar-ustar]) +AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules]) +AM_SILENT_RULES([yes]) AC_GNU_SOURCE AC_PROG_CC AC_PROG_CC_STDC if test "x$ac_cv_prog_cc_c99" = xno; then - AC_MSG_ERROR([could not find a C99 compatible compiler]) + AC_MSG_ERROR([could not find a C99 compatible compiler]) fi AC_PROG_CPP @@ -37,9 +38,6 @@ 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/sysinfo.h) @@ -51,93 +49,8 @@ AC_CHECK_FUNCS(sysinfo getloadavg) AC_CHECK_LIB(pcre, pcre_compile,, AC_MSG_ERROR([required library libpcre not found])) -# 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` - -# pkg-config -PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES([libvarnishapi], [varnishapi]) - -varnishapi_version() { - VARNISHAPI_MAJOR=$1 - VARNISHAPI_MINOR=$2 - VARNISHAPI_PATCH=$3 -} - -v=$($PKG_CONFIG --modversion varnishapi) -if test -n "$v"; then - save_IFS=$IFS - IFS='.' - varnishapi_version $v - IFS=$save_IFS -else - AC_MSG_ERROR([unknown varnishapi version]) -fi - -if test $VARNISHAPI_MAJOR -ne 4; then - AC_MSG_ERROR([unsupported varnishapi version]) -fi - -case $VARNISHAPI_MINOR in -0) AC_MSG_ERROR([unsupported varnishapi version]);; -1) ;; -*) AC_MSG_WARN([varnishapi minor version probably unsupported]) -esac - -# 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 - -AC_CONFIG_COMMANDS([status],[ -delim="-------------------------------------------------------------------" -echo "" -echo $delim -echo "Building for Varnish version $VARNISHAPI_MAJOR.$VARNISHAPI_MINOR" -echo $delim -], -[VARNISHAPI_MAJOR=$VARNISHAPI_MAJOR -VARNISHAPI_MINOR=$VARNISHAPI_MINOR -]) - +AM_VARNISHAPI + AC_CONFIG_TESTDIR(tests) AC_CONFIG_FILES([tests/Makefile tests/atlocal]) AM_MISSING_PROG([AUTOM4TE], [autom4te]) diff --git a/src/Makefile.am b/src/Makefile.am index 81c5b4e..5396773 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ # This file is part of vmod-variable -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2016 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 @@ -43,7 +43,7 @@ vmodtoolargs = --strict vccfile = $(top_srcdir)/src/variable.vcc vcc_if.c vcc_if.h: $(vmodtool) $(vccfile) - @PYTHON@ $(vmodtool) $(vmodtoolargs) $(vccfile) + $(AM_V_GEN)$(PYTHON) $(vmodtool) $(vmodtoolargs) $(vccfile) EXTRA_DIST = \ variable.vcc diff --git a/src/variable.c b/src/variable.c index 4982b65..e38d44b 100644 --- a/src/variable.c +++ b/src/variable.c @@ -1,18 +1,18 @@ -/* This file is part of vmod-tbf - Copyright (C) 2013-2015 Sergey Poznyakoff +/* This file is part of vmod-variable + Copyright (C) 2013-2016 Sergey Poznyakoff - Vmod-tbf is free software; you can redistribute it and/or modify + 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 the Free Software Foundation; either version 3, or (at your option) any later version. - Vmod-tbf 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 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-tbf. If not, see <http://www.gnu.org/licenses/>. + along with vmod-variable. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <stdlib.h> diff --git a/src/variable.vcc b/src/variable.vcc index 7a3151f..b2888fa 100644 --- a/src/variable.vcc +++ b/src/variable.vcc @@ -1,5 +1,5 @@ # This file is part of vmod-variable -# Copyright (C) 2015 Sergey Poznyakoff +# Copyright (C) 2015, 2016 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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 594b1f5..2d5a2d6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -60,17 +60,17 @@ M4=m4 AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): package.m4 $(TESTSUITE_AT) - $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp + $(AM_V_at)mv $@.tmp $@ atconfig: $(top_builddir)/config.status - cd $(top_builddir) && ./config.status tests/$@ + @cd $(top_builddir) && ./config.status tests/$@ clean-local: - test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean + @test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean check-local: atconfig atlocal $(TESTSUITE) - $(SHELL) $(TESTSUITE) + @$(SHELL) $(TESTSUITE) # Run the test suite on the *installed* tree. #installcheck-local: |