Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-vslp
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-vslp
Commits
496725d6
Commit
496725d6
authored
Sep 28, 2015
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use includes from VARNISHSRC if we need to
parent
e920074d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
4 deletions
+26
-4
configure.ac
configure.ac
+25
-0
Makefile.am
src/Makefile.am
+1
-4
No files found.
configure.ac
View file @
496725d6
...
...
@@ -63,6 +63,31 @@ VARNISH_VMOD_INCLUDES
VARNISH_VMOD_DIR
VARNISH_VMODTOOL
AC_SUBST([VMOD_EXTRA_INCLUDES])
_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$VMOD_INCLUDES $CPPFLAGS"
AC_CHECK_HEADER(vgz.h, [],
[
AC_ARG_VAR([VARNISHSRC], [path to Varnish source tree])
if test "x$VARNISHSRC" = x; then
AC_MSG_ERROR([vgz.h not found, set VARNISHSRC to your varnish source tree])
fi
VARNISHSRC=`cd $VARNISHSRC && pwd`
AC_CHECK_FILE([$VARNISHSRC/include/vrt.h],
[],
[AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])])
CPPFLAGS="$_CPPFLAGS"
CPPFLAGS="-I$VARNISHSRC/lib/libvgz $CPPFLAGS"
unset ac_cv_header_vgz_h
AC_CHECK_HEADER(vgz.h, [], [AC_MSG_FAILURE([vgz.h not found in "$VARNISHSRC"])])
VMOD_EXTRA_INCLUDES=-I$VARNISHSRC/lib/libvgz
])
CPPFLAGS="$_CPPFLAGS"
# as long as we still need crc32 from libvgz from the Varnish source tree
AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
[$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
AC_PATH_PROG([VARNISHD], [varnishd], [],
...
...
src/Makefile.am
View file @
496725d6
AM_CPPFLAGS
=
@VMOD_INCLUDES@
-Wall
-Werror
# -I$(VARNISHSRC)/include \
# -I$(VARNISHSRC)/bin/varnishd \
# -I$(VARNISHSRC)/lib/libvgz
AM_CPPFLAGS
=
@VMOD_INCLUDES@ @VMOD_EXTRA_INCLUDES@
-Wall
-Werror
vmoddir
=
@VMOD_DIR@
vmod_LTLIBRARIES
=
libvmod_vslp.la
...
...
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