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
2d4565b6
Commit
2d4565b6
authored
May 30, 2016
by
Federico G. Schwindt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check pcre_study() is working in configure
parent
1e0bb694
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
autogen.des
autogen.des
+0
-8
configure.ac
configure.ac
+17
-5
No files found.
autogen.des
View file @
2d4565b6
...
@@ -6,8 +6,6 @@ set -ex
...
@@ -6,8 +6,6 @@ set -ex
make
-k
distclean
>
/dev/null 2>&1
||
true
make
-k
distclean
>
/dev/null 2>&1
||
true
OPTS
=
""
# Prefer CLANG if we have it, and have not given preferences
# Prefer CLANG if we have it, and have not given preferences
if
[
-f
/usr/bin/clang
-a
"x
${
CC
}
"
=
"x"
]
;
then
if
[
-f
/usr/bin/clang
-a
"x
${
CC
}
"
=
"x"
]
;
then
CC
=
clang
CC
=
clang
...
@@ -20,14 +18,9 @@ else
...
@@ -20,14 +18,9 @@ else
DST
=
"--prefix=/opt/varnish --mandir=/opt/varnish/man"
DST
=
"--prefix=/opt/varnish --mandir=/opt/varnish/man"
fi
fi
if
[
"x
`
uname
-po
`
"
=
"xFreeBSD armv6"
]
;
then
OPTS
=
"
${
OPTS
}
--disable-pcre-jit"
fi
rm
-f
configure
rm
-f
configure
.
./autogen.sh 2>&1 | egrep
-v
"(subdir-objects|is in a subdirectory)"
.
./autogen.sh 2>&1 | egrep
-v
"(subdir-objects|is in a subdirectory)"
# autoconf prior to 2.62 has issues with zsh 4.2 and newer
# autoconf prior to 2.62 has issues with zsh 4.2 and newer
export
CONFIG_SHELL
=
/bin/sh
export
CONFIG_SHELL
=
/bin/sh
...
@@ -39,5 +32,4 @@ export CONFIG_SHELL=/bin/sh
...
@@ -39,5 +32,4 @@ export CONFIG_SHELL=/bin/sh
--enable-developer-warnings
\
--enable-developer-warnings
\
--enable-debugging-symbols
\
--enable-debugging-symbols
\
--enable-dependency-tracking
\
--enable-dependency-tracking
\
$OPTS
\
"
$@
"
"
$@
"
configure.ac
View file @
2d4565b6
...
@@ -161,17 +161,29 @@ if test "$enable_pcre_jit" = yes; then
...
@@ -161,17 +161,29 @@ if test "$enable_pcre_jit" = yes; then
AC_MSG_CHECKING(for PCRE JIT usability)
AC_MSG_CHECKING(for PCRE JIT usability)
save_CFLAGS="${CFLAGS}"
save_CFLAGS="${CFLAGS}"
CFLAGS="${PCRE_CFLAGS}"
CFLAGS="${PCRE_CFLAGS}"
AC_COMPILE_IFELSE(
save_LIBS="${CFLAGS}"
[AC_LANG_PROGRAM([[#include "pcre.h"
LIBS="${PCRE_LIBS}"
#if PCRE_MAJOR != 8 || PCRE_MINOR < 32
AC_RUN_IFELSE(
#error no jit
[AC_LANG_PROGRAM([[
#endif]])],
#include <pcre.h>
#if PCRE_MAJOR != 8 || PCRE_MINOR < 32
#error no jit
#endif
]],[[
const char *error;
pcre *re;
int erroroffset;
re = pcre_compile(".", 0, &error, &erroroffset, NULL);
if (!pcre_study(re, PCRE_STUDY_JIT_COMPILE, &error))
return (1);
]])],
[AC_MSG_RESULT(yes)
[AC_MSG_RESULT(yes)
AC_DEFINE([USE_PCRE_JIT], [1], [Use the PCRE JIT compiler])
AC_DEFINE([USE_PCRE_JIT], [1], [Use the PCRE JIT compiler])
],
],
[AC_MSG_RESULT(no)]
[AC_MSG_RESULT(no)]
)
)
CFLAGS="${save_CFLAGS}"
CFLAGS="${save_CFLAGS}"
LIBS="${save_LIBS}"
fi
fi
...
...
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