Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-vtstor
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
libvmod-vtstor
Commits
be32548b
Commit
be32548b
authored
Aug 22, 2016
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update build infrastructure to current libvmod-example
parent
92864399
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
73 deletions
+97
-73
Makefile.am
Makefile.am
+5
-13
autogen.sh
autogen.sh
+29
-20
configure.ac
configure.ac
+40
-24
Makefile.am
src/Makefile.am
+23
-16
No files found.
Makefile.am
View file @
be32548b
ACLOCAL_AMFLAGS
=
-I
m4
ACLOCAL_AMFLAGS
=
-I
m4
-I
${
LIBVARNISHAPI_DATAROOTDIR
}
/aclocal
SUBDIRS
=
src
EXTRA_DIST
=
README.rst
DISTCHECK_CONFIGURE_FLAGS
=
\
VMOD_DIR
=
'$${libdir}/varnish/vmods'
dist_man_MANS
=
vmod_vtstor.3
MAINTAINERCLEANFILES
=
$(dist_man_MANS)
EXTRA_DIST
=
README.rst LICENSE
vmod_vtstor.3
:
README.rst
if
HAVE_RST2MAN
${RST2MAN}
README.rst
$@
else
@echo
"========================================"
@echo
"You need rst2man installed to make dist"
@echo
"========================================"
@false
endif
doc_DATA
=
README.rst LICENSE
autogen.sh
View file @
be32548b
...
...
@@ -6,38 +6,47 @@ warn() {
case
`
uname
-s
`
in
Darwin
)
LIBTOOLIZE
=
glibtoolize
;;
LIBTOOLIZE
=
glibtoolize
;;
FreeBSD
)
LIBTOOLIZE
=
libtoolize
;;
LIBTOOLIZE
=
libtoolize
;;
Linux
)
LIBTOOLIZE
=
libtoolize
;;
LIBTOOLIZE
=
libtoolize
;;
SunOS
)
LIBTOOLIZE
=
libtoolize
;;
LIBTOOLIZE
=
libtoolize
;;
*
)
warn
"unrecognized platform:"
`
uname
-s
`
LIBTOOLIZE
=
libtoolize
warn
"unrecognized platform:"
`
uname
-s
`
LIBTOOLIZE
=
libtoolize
esac
automake_version
=
`
automake
--version
|
tr
' '
'\n'
| egrep
'^[0-9]\.[0-9a-z.-]+'
`
if
[
-z
"
$automake_version
"
]
;
then
warn
"unable to determine automake version"
warn
"unable to determine automake version"
else
case
$automake_version
in
0.
*
|
1.[0-8]|1.[0-8][.-]
*
)
warn
"automake (
$automake_version
) detected; 1.9 or newer recommended"
;;
*
)
;;
esac
case
$automake_version
in
0.
*
|
1.[0-8]|1.[0-8][.-]
*
)
warn
"automake (
$automake_version
) detected; 1.9 or newer recommended"
;;
*
)
;;
esac
fi
# check for varnishapi.m4 in custom paths
dataroot
=
$(
pkg-config
--variable
=
datarootdir varnishapi 2>/dev/null
)
if
[
-z
"
$dataroot
"
]
;
then
cat
>
&2
<<
'
EOF
'
Package varnishapi was not found in the pkg-config search path.
Perhaps you should add the directory containing `varnishapi.pc'
to the PKG_CONFIG_PATH environment variable
EOF
exit
1
fi
set
-ex
aclocal
-I
m4
aclocal
-I
m4
-I
${
dataroot
}
/aclocal
$LIBTOOLIZE
--copy
--force
autoheader
automake
--add-missing
--copy
--foreign
...
...
configure.ac
View file @
be32548b
...
...
@@ -2,6 +2,7 @@ AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2015 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([libvmod-vtstor], [4.0])
AC_CONFIG_MACRO_DIR([m4])
m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
AC_CONFIG_SRCDIR(src/vmod_vtstor.vcc)
AM_CONFIG_HEADER(config.h)
...
...
@@ -18,6 +19,13 @@ if test "x$ac_cv_prog_cc_c99" = xno; then
fi
AC_PROG_CPP
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
LT_INIT([disable-static])
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
...
...
@@ -25,37 +33,50 @@ AC_PROG_MAKE_SET
# Check for rst utilities
AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
if test "x$RST2MAN" = "xno"; then
AC_MSG_
WARN([rst2man not found - not building
man pages])
AC_MSG_
ERROR([rst2man not found - cannot build
man pages])
fi
AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
# Check for pkg-config
PKG_PROG_PKG_CONFIG
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/stdlib.h])
# Check for python
AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2.6 python2.5 python2 python], [AC_MSG_ERROR([Python is needed to build this vmod, please install python.])])
# backwards compat with older pkg-config
# - pull in AC_DEFUN from pkg.m4
m4_ifndef([PKG_CHECK_VAR], [
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# -------------------------------------------
# Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR
])
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
# Check paths to varnishd and varnishtest
AC_ARG_VAR([VARNISHTEST], [path to varnishtest (mandatory for make check)])
AC_ARG_VAR([VARNISHD], [path to varnishd (mandatory for make check)])
AC_PATH_PROG([VARNISHTEST], [varnishtest])
AC_PATH_PROG([VARNISHD], [varnishd], [/bin/false],
[${PATH}${PATH_SEPARATOR}/usr/local/sbin${PATH_SEPARATOR}/usr/sbin])
if test "x$VARNISHD" = x; then
AC_MSG_FAILURE([Can't locate varnishd])
fi
if test "x$VARNISHTEST" = x; then
AC_MSG_FAILURE([Can't locate varnishtest])
fi
AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
[$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
AC_PATH_PROG([VARNISHD], [varnishd], [],
[$LIBVARNISHAPI_SBINDIR:$LIBVARNISHAPI_BINDIR:$PATH])
# This corresponds to FreeBSD's WARNS level 6
DEVELOPER_CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wformat"
...
...
@@ -110,11 +131,6 @@ if test "x$enable_stack_protector" != "xno"; then
CFLAGS="$save_CFLAGS"])
fi
# --enable-tests
AC_ARG_ENABLE(tests,
AS_HELP_STRING([--enable-tests],[build test programs (default is NO)]))
AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes])
# --enable-werror
AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror],[use -Werror (default is NO)]),
...
...
src/Makefile.am
View file @
be32548b
AM_CPPFLAGS
=
@VMOD_INCLUDES@
AM_LDFLAGS
=
$(AM_LT_LDFLAGS)
AM_CPPFLAGS
=
@VMOD_INCLUDES@
-Wall
-Werror
vmoddir
=
@VMOD_DIR@
vmod_LTLIBRARIES
=
libvmod_vtstor.la
libvmod_vtstor_la_LDFLAGS
=
$(AM_LDFLAGS)
-module
-export-dynamic
-avoid-version
-shared
libvmod_vtstor_la_LDFLAGS
=
-module
-export-dynamic
-avoid-version
-shared
libvmod_vtstor_la_SOURCES
=
\
v
mod_v
tstor.c
\
vtstor.c
vtstor.c
\
v
mod_v
tstor.c
nodist_libvmod_vtstor_la_SOURCES
=
\
vcc_if.c
\
vcc_if.h
vmod_vtstor.lo
:
vcc_if.h
dist_man_MANS
=
vmod_vtstor.3
vmod_vtstor.3
:
vmod_vtstor.man.rst
${
RST2MAN
}
$<
$@
vcc_if.c vcc_if.h
:
@VMODTOOL@ $(top_srcdir)/src/vmod_vtstor.vcc
@
VMODTOOL@
$(top_srcdir)
/src/vmod_vtstor.vcc
VMOD_TESTS
=
tests/
*
.vtc
.PHONY
:
$(VMOD_TESTS)
vmod_vtstor.lo vmod_vtstor.man.rst
:
vcc
tests/*.vtc
:
vcc
:
@VMODTOOL@ $(top_srcdir)/src/vmod_vtstor.vcc
@
PYTHON@ @VMODTOOL@
$(top_srcdir)
/src/vmod_vtstor.vcc
VMOD_TESTS
=
$(top_srcdir)
/src/tests/
*
.vtc
.PHONY
:
$(VMOD_TESTS) vcc
$(top_srcdir)/src/tests/*.vtc
:
libvmod_vtstor.la
@
VARNISHTEST@
-Dvarnishd
=
@VARNISHD@
-Dvmod_topbuild
=
$(abs_top_builddir)
$@
check
:
$(VMOD_TESTS)
EXTRA_DIST
=
\
vmod_vtstor.vcc
\
vmod_vtstor.vcc
\
$(VMOD_TESTS)
CLEANFILES
=
$(builddir)
/vcc_if.c
$(builddir)
/vcc_if.h
CLEANFILES
=
\
$(builddir)
/vcc_if.c
\
$(builddir)
/vcc_if.h
\
$(builddir)
/vmod_vtstor.rst
\
$(builddir)
/vmod_vtstor.man.rst
\
$(dist_man_MANS)
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