Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
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
varnish-cache
Commits
383c4497
Commit
383c4497
authored
Nov 11, 2015
by
Federico G. Schwindt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the pcre jit check to configure
Output whether pcre jit is usable at configure time.
parent
3b0b8770
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
12 deletions
+22
-12
configure.ac
configure.ac
+21
-11
vre.c
lib/libvarnish/vre.c
+1
-1
No files found.
configure.ac
View file @
383c4497
...
@@ -151,6 +151,27 @@ fi
...
@@ -151,6 +151,27 @@ fi
AC_SUBST(PCRE_CFLAGS)
AC_SUBST(PCRE_CFLAGS)
AC_SUBST(PCRE_LIBS)
AC_SUBST(PCRE_LIBS)
# --enable-pcre-jit
AC_ARG_ENABLE(pcre-jit,
AS_HELP_STRING([--enable-pcre-jit],
[use the PCRE JIT compiler (default is YES)]),
[],
[enable_pcre_jit=yes])
if test "$enable_pcre_jit" = yes; then
AC_MSG_CHECKING(for PCRE JIT usability)
AC_PREPROC_IFELSE(
[AC_LANG_PROGRAM([[#include "pcre.h"
#if PCRE_MAJOR != 8 || PCRE_MINOR < 32
#error no jit
#endif]])],
[AC_MSG_RESULT(yes)
AC_DEFINE([USE_PCRE_JIT], [1], [Use the PCRE JIT compiler])
],
[AC_MSG_RESULT(no)]
)
fi
AC_CHECK_HEADERS([edit/readline/readline.h],
AC_CHECK_HEADERS([edit/readline/readline.h],
[AC_DEFINE([HAVE_LIBEDIT], [1], [Define if we have libedit])
[AC_DEFINE([HAVE_LIBEDIT], [1], [Define if we have libedit])
LIBEDIT_LIBS="-ledit"],
LIBEDIT_LIBS="-ledit"],
...
@@ -611,17 +632,6 @@ fi
...
@@ -611,17 +632,6 @@ fi
AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
# --enable-pcre-jit
AC_ARG_ENABLE(pcre-jit,
AS_HELP_STRING([--enable-pcre-jit],
[use the PCRE JIT compiler (default is YES)]),
,
[enable_pcre_jit=yes])
if test "$enable_pcre_jit" = yes; then
AC_DEFINE([USE_PCRE_JIT],[1],[use the PCRE JIT compiler])
fi
# Stupid automake needs this
# Stupid automake needs this
VTC_TESTS="$(cd $srcdir/bin/varnishtest && echo tests/*.vtc)"
VTC_TESTS="$(cd $srcdir/bin/varnishtest && echo tests/*.vtc)"
AC_SUBST(VTC_TESTS)
AC_SUBST(VTC_TESTS)
...
...
lib/libvarnish/vre.c
View file @
383c4497
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
#include "vre.h"
#include "vre.h"
#if defined(USE_PCRE_JIT)
&& PCRE_MAJOR == 8 && PCRE_MINOR >= 32
#if defined(USE_PCRE_JIT)
#define VRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
#define VRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
#else
#else
#define VRE_STUDY_JIT_COMPILE 0
#define VRE_STUDY_JIT_COMPILE 0
...
...
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