Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-example
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
libvmod-example
Commits
030bd14b
Commit
030bd14b
authored
Sep 19, 2016
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the new autoconf macros
parent
c3f323bd
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
56 deletions
+23
-56
.gitignore
.gitignore
+4
-2
Makefile.am
Makefile.am
+1
-4
configure.ac
configure.ac
+5
-19
Makefile.am
src/Makefile.am
+11
-29
test01.vtc
src/tests/test01.vtc
+1
-1
vmod_example.c
src/vmod_example.c
+1
-1
No files found.
.gitignore
View file @
030bd14b
...
@@ -7,6 +7,8 @@ Makefile.in
...
@@ -7,6 +7,8 @@ Makefile.in
*.la
*.la
*~
*~
*.[1-9]
*.[1-9]
*.log
*.trs
/aclocal.m4
/aclocal.m4
/autom4te.cache/
/autom4te.cache/
...
@@ -24,6 +26,6 @@ Makefile.in
...
@@ -24,6 +26,6 @@ Makefile.in
/m4/ltversion.m4
/m4/ltversion.m4
/m4/lt~obsolete.m4
/m4/lt~obsolete.m4
/src/vcc_if.c
/src/vcc_
*_
if.c
/src/vcc_if.h
/src/vcc_
*_
if.h
/src/vmod_*rst
/src/vmod_*rst
Makefile.am
View file @
030bd14b
ACLOCAL_AMFLAGS
=
-I
m4
-I
${
LIB
VARNISHAPI_DATAROOTDIR
}
/aclocal
ACLOCAL_AMFLAGS
=
-I
m4
-I
${
VARNISHAPI_DATAROOTDIR
}
/aclocal
SUBDIRS
=
src
SUBDIRS
=
src
DISTCHECK_CONFIGURE_FLAGS
=
\
VMOD_DIR
=
'$${libdir}/varnish/vmods'
EXTRA_DIST
=
README.rst LICENSE
EXTRA_DIST
=
README.rst LICENSE
doc_DATA
=
README.rst LICENSE
doc_DATA
=
README.rst LICENSE
configure.ac
View file @
030bd14b
...
@@ -2,7 +2,6 @@ AC_PREREQ([2.68])
...
@@ -2,7 +2,6 @@ AC_PREREQ([2.68])
AC_INIT([libvmod-example], [0.1], [], [vmod-example])
AC_INIT([libvmod-example], [0.1], [], [vmod-example])
AC_COPYRIGHT([Copyright (c) 2011-2016 Varnish Software AS])
AC_COPYRIGHT([Copyright (c) 2011-2016 Varnish Software AS])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR(src/vmod_example.vcc)
AC_CONFIG_SRCDIR(src/vmod_example.vcc)
AC_CONFIG_HEADER([config.h])
AC_CONFIG_HEADER([config.h])
...
@@ -27,27 +26,14 @@ if test "x$RST2MAN" = "xno"; then
...
@@ -27,27 +26,14 @@ if test "x$RST2MAN" = "xno"; then
AC_MSG_ERROR([rst2man not found - cannot build man pages])
AC_MSG_ERROR([rst2man not found - cannot build man pages])
fi
fi
m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
VARNISH_PREREQ([4.1.3])
VARNISH_VMODS([example])
VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
AC_SUBST(VMOD_TESTS)
AC_SUBST(VMOD_TESTS)
PKG_CHECK_MODULES([libvarnishapi], [varnishapi])
PKG_CHECK_VAR([LIBVARNISHAPI_PREFIX], [varnishapi], [prefix])
PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir])
PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir])
PKG_CHECK_VAR([LIBVARNISHAPI_SBINDIR], [varnishapi], [sbindir])
AC_SUBST([LIBVARNISHAPI_DATAROOTDIR])
# Varnish include files tree
VARNISH_VMOD_INCLUDES
VARNISH_VMOD_DIR
VARNISH_VMODTOOL
# inherit the prefix from Varnish.
# acessing ac_ variable because AC_PREFIX_DEFAULT acts too early
ac_default_prefix=$LIBVARNISHAPI_PREFIX
AC_PATH_PROG([VARNISHTEST], [varnishtest], [], [$LIBVARNISHAPI_BINDIR:$PATH])
AC_PATH_PROG([VARNISHD], [varnishd], [], [$LIBVARNISHAPI_SBINDIR:$PATH])
PKG_CHECK_VAR([LIBVARNISHAPI_LIBDIR], [varnishapi], [libdir])
PKG_CHECK_VAR([LIBVARNISHAPI_LIBDIR], [varnishapi], [libdir])
AC_SUBST([VARNISH_LIBRARY_PATH],
AC_SUBST([VARNISH_LIBRARY_PATH],
[$LIBVARNISHAPI_LIBDIR:$LIBVARNISHAPI_LIBDIR/varnish])
[$LIBVARNISHAPI_LIBDIR:$LIBVARNISHAPI_LIBDIR/varnish])
...
...
src/Makefile.am
View file @
030bd14b
AM_CPPFLAGS
=
@VMOD_INCLUDES@
-Wall
-Werror
AM_CFLAGS
=
$(VARNISHAPI_CFLAGS)
-Wall
-Werror
AM_LDFLAGS
=
$(VARNISHAPI_LIBS)
$(VMOD_LDFLAGS)
$(CODE_COVERAGE_LDFLAGS)
TESTS_ENVIRONMENT
=
PATH
=
$(LIBVARNISHAPI_BINDIR)
:
$(LIBVARNISHAPI_SBINDIR)
:
$$
PATH
vmoddir
=
@VMOD_DIR@
vmod_LTLIBRARIES
=
libvmod_example.la
vmod_LTLIBRARIES
=
libvmod_example.la
libvmod_example_la_LDFLAGS
=
-module
-export-dynamic
-avoid-version
-shared
libvmod_example_la_SOURCES
=
\
libvmod_example_la_SOURCES
=
\
vmod_example.c
vmod_example.c
nodist_libvmod_example_la_SOURCES
=
\
nodist_libvmod_example_la_SOURCES
=
\
vcc_if.c
\
vcc_
example_
if.c
\
vcc_if.h
vcc_
example_
if.h
dist_man_MANS
=
vmod_example.3
dist_man_MANS
=
vmod_example.3
vmod_example.3
:
vmod_example.man.rst
@BUILD_VMOD_EXAMPLE@
${
RST2MAN
}
$<
$@
vmod_example.lo
:
vcc_if.c
vmod_example.man.rst vcc_if.c
:
vcc_if.h
vcc_if.h
:
@VMODTOOL@ $(top_srcdir)/src/vmod_example.vcc
AM_TESTS_ENVIRONMENT
=
\
@
PYTHON@ @VMODTOOL@
$(top_srcdir)
/src/vmod_example.vcc
PATH
=
"
$(VMOD_TEST_PATH)
"
\
LD_LIBRARY_PATH
=
"
$(VARNISH_LIBRARY_PATH)
"
AM_TESTS_ENVIRONMENT
=
LD_LIBRARY_PATH
=
"
$(VARNISH_LIBRARY_PATH)
"
VTC_LOG_COMPILER
=
$(VARNISHTEST)
-v
\
-Dvmod_topbuild
=
$(abs_top_builddir)
TEST_EXTENSIONS
=
.vtc
TEST_EXTENSIONS
=
.vtc
TESTS
=
@VMOD_TESTS@
VTC_LOG_COMPILER
=
varnishtest
-v
AM_VTC_LOG_FLAGS
=
-Dvmod_example
=
"
$(VMOD_EXAMPLE)
"
@VMOD_TESTS@
:
vmod_example.lo
TESTS
=
@VMOD_TESTS@
EXTRA_DIST
=
\
EXTRA_DIST
=
\
vmod_example.vcc
\
vmod_example.vcc
\
$(VMOD_TESTS)
$(VMOD_TESTS)
CLEANFILES
=
\
$(builddir)
/vcc_if.c
\
$(builddir)
/vcc_if.h
\
$(builddir)
/vmod_example.rst
\
$(builddir)
/vmod_example.man.rst
\
$(dist_man_MANS)
src/tests/test01.vtc
View file @
030bd14b
...
@@ -7,7 +7,7 @@ server s1 {
...
@@ -7,7 +7,7 @@ server s1 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import std;
import std;
import
example from "${vmod_topbuild}/src/.libs/libvmod_example.so"
;
import
${vmod_example}
;
sub vcl_init {
sub vcl_init {
std.log(example.info());
std.log(example.info());
...
...
src/vmod_example.c
View file @
030bd14b
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
#include "cache/cache.h"
#include "cache/cache.h"
#include "vtim.h"
#include "vtim.h"
#include "vcc_if.h"
#include "vcc_
example_
if.h"
const
size_t
infosz
=
64
;
const
size_t
infosz
=
64
;
char
*
info
;
char
*
info
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment