Skip to content

7.1 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

7.1 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
891dc5b
Update autoconf & fix AC_ARG_WITH syntax
nigoroll May 20, 2022
338ad01
Adjustments for current varnish-cache
nigoroll May 20, 2022
c797fe1
Adjustments for current varnish-cache: __match_proto__ -> v_matchproto_
nigoroll May 20, 2022
54f051c
Adjustments for current varnish-cache: task methods
nigoroll May 20, 2022
103350c
Quick fix for cache_param access
nigoroll May 20, 2022
c1e9243
Adjustments for current varnish-cache: Workspace interface
nigoroll May 20, 2022
1a8451e
Adjustments for current varnish-cache: VRT interface
nigoroll May 20, 2022
b441c2e
Adjustments for current varnish-cache: Misc & includes
nigoroll May 20, 2022
47ccd3e
Remove superfluous mutex
nigoroll May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
AC_PREREQ([2.63])
AC_INIT([libvmod-soap], [1.0], [], [vmod-soap])
AC_PREREQ([2.69])
AC_INIT([libvmod-soap],[1.0],[],[vmod-soap])
AC_COPYRIGHT([Copyright (c) 2019, Refinitiv])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR(src/vmod_soap.vcc)
AC_CONFIG_HEADER([config.h])
AC_CONFIG_HEADERS([config.h])

AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign parallel-tests])
AM_SILENT_RULES([yes])
Expand All @@ -24,28 +24,24 @@ AC_ARG_WITH([rst2man],
[--with-rst2man=PATH],
[Location of rst2man (auto)]),
[RST2MAN="$withval"],
AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], []))
[AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])])

m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.md]))

VARNISH_PREREQ([4.1], [5.0.0])
VARNISH_PREREQ([4.1], [trunk])
VARNISH_VMODS([soap])

AC_SUBST([VARNISHSRC])
AC_ARG_VAR([VARNISHSRC], [path to Varnish source tree])
AS_IF([test "x${VARNISHSRC}" = "x" ], AC_MSG_FAILURE([\$VARNISHSRC is not set]), AC_MSG_RESULT([yes]))
AC_CHECK_FILE([$VARNISHSRC/include/vrt.h],
[],
[AC_MSG_FAILURE([\$VARNISHSRC "$VARNISHSRC" is not a Varnish source directory])]
[],
[AC_MSG_FAILURE([\$VARNISHSRC "$VARNISHSRC" is not a Varnish source directory])]
)

VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
AC_SUBST(VMOD_TESTS)

PKG_CHECK_VAR([LIBVARNISHAPI_LIBDIR], [varnishapi], [libdir])
AC_SUBST([VARNISH_LIBRARY_PATH],
[$LIBVARNISHAPI_LIBDIR:$LIBVARNISHAPI_LIBDIR/varnish])

AC_CONFIG_FILES([
Makefile
src/Makefile
Expand Down
Loading