aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2014-10-31 15:55:19 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2014-10-31 15:55:19 +0200
commit7965195e932d5ed4844dbef1e2da6e871aea6fe1 (patch)
tree11a30844929feeb08fd5fc9299f17c51583d52b3 /configure.ac
parent5d7657a6b0c7c5f72dbee90f1025e9facab0b4c9 (diff)
downloadvmod-dbrw-7965195e932d5ed4844dbef1e2da6e871aea6fe1.tar.gz
vmod-dbrw-7965195e932d5ed4844dbef1e2da6e871aea6fe1.tar.bz2
Build for both v3 and v4
* NEWS: Update version number. * configure.ac: Version 1.9.90 (VARNISHVERSION): New variable. (VARNISH3,VARNISH4): New conditionals. * src/Makefile.am (nodist_libvmod_dbrw_la_SOURCES): New variable. (vmodtool,vmodtoolargs,vccfile): Define depending on Varnish version. (.vcc.vcc3): New rule (vcc_if.c vcc_if.h): Depend on $(vccfile) Don't distribute vcc_if.c and vcc_if.h. * src/vmod_dbrw.c: Provide data types and access macros depending on the version of Varnish.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac17
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index e1c55eb..ce9087c 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], 1.0.91-vcl4, [gray@gnu.org])
+AC_INIT([vmod-dbrw], 1.9.90, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_dbrw.vcc)
@@ -64,10 +64,17 @@ case "$VARNISHSRC" in
esac
VARNISHSRC=`cd $VARNISHSRC && pwd`
-AC_CHECK_FILE([$VARNISHSRC/include/vapi/vsm.h],
- [],
- [AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])])
-
+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])
+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],
[],

Return to:

Send suggestions and report system problems to the System administrator.