diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/vmod_dbrw.c | 7 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
5 files changed, 6 insertions, 13 deletions
@@ -1,10 +1,10 @@ -vmod-dbrw -- history of user-visible changes. 2017-08-05 +vmod-dbrw -- history of user-visible changes. 2017-08-06 Copyright (C) 2013-2017 Sergey Poznyakoff See the end of file for copying conditions. Please send vmod-dbrw bug reports to <gray@gnu.org> -Version 2.0.92, (Git) +Version 2.1, 2017-08-06 * Requires Varnish 4.1 diff --git a/configure.ac b/configure.ac index 681d471..51e8c92 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-dbrw. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.69) -AC_INIT([vmod-dbrw], 2.0.92, [gray@gnu.org]) +AC_INIT([vmod-dbrw], 2.1, [gray@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/vmod_dbrw.vcc) diff --git a/src/Makefile.am b/src/Makefile.am index f971354..6cda3aa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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/>. -AM_CPPFLAGS=$(VARNISHAPI_CFLAGS) -I. +AM_CPPFLAGS=$(VARNISHAPI_CFLAGS) -I$(srcdir) -I$(builddir) noinst_LTLIBRARIES = libsql.la libsql_la_SOURCES = \ be.c\ @@ -42,7 +42,7 @@ libvmod_dbrw_la_LIBADD=./libsql.la libvmod_dbrw_la_SOURCES = vmod_dbrw.c nodist_libvmod_dbrw_la_SOURCES = vcc_if.c vcc_if.h -vmod_dbrw.lo: vcc_if.h +$(libsql_la_SOURCES:.c=.lo): vcc_if.h CLEANFILES = vcc_if.c vcc_if.h *.rst diff --git a/src/vmod_dbrw.c b/src/vmod_dbrw.c index 9e6af1e..b6fe70c 100644 --- a/src/vmod_dbrw.c +++ b/src/vmod_dbrw.c @@ -570,10 +570,3 @@ vmod_rewrite(VRT_CTX, struct vmod_priv *priv, VCL_STRING arg) debug(conf, 1, ("vmod_rewrite: res=%s", res ? res : "(NULL)")); return res; } -wd() -{ - int volatile _st=0; - while (!_st) { - _st=_st; - } -} diff --git a/tests/Makefile.am b/tests/Makefile.am index 0da98e8..b433468 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -76,7 +76,7 @@ check_PROGRAMS = initdb initdb_SOURCES = initdb.c initdb_LDADD = ../src/libsql.la initdb_CFLAGS = $(AM_CFLAGS) -AM_CPPFLAGS = $(VARNISHAPI_CFLAGS) -I$(top_srcdir)/src +AM_CPPFLAGS = $(VARNISHAPI_CFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src |