diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-10 03:18:08 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-10 03:18:08 +0000 |
| commit | a2107a6705bc3decb05125e0ff4b35de418b9068 (patch) | |
| tree | 5ec7c2cd7bdbb93cbe300d5195109291f4765080 | |
| parent | 8967b7e032aad31ceb6b6fba9ae71f5eb3c16010 (diff) | |
| download | nginx-a2107a6705bc3decb05125e0ff4b35de418b9068.tar.gz | |
Merge of r4961: configure: better check for PCRE JIT.
On Mac OS X system toolchain by default prefers include files
from /usr/local/include, but libraries from /usr/lib. This might result in
various problems, in particular the one outlined below.
If the PCRE library is installed into /usr/local/, this results in pcre.h
being used from /usr/local/include (with PCRE_CONFIG_JIT defined), but
libpcre from /usr/lib (as shipped with the OS, without pcre_free_study()
symbol). As a result build fails as we use pcre_free_study() function
if we try to compile with PCRE JIT support.
Obvious workaround to the root cause is to ask compiler to prefer
library from /usr/local/lib via ./configure --with-ld-opt="-L/usr/local/lib".
On the other hand, in any case it would be good to check if the function
we are going to use is available, hence the change.
See thread here for details:
http://mailman.nginx.org/pipermail/nginx-devel/2012-December/003074.html
Prodded by Piotr Sikora.
| -rw-r--r-- | auto/lib/pcre/conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 6a8c326c4..345860053 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -172,6 +172,7 @@ else ngx_feature="PCRE JIT support" ngx_feature_name="NGX_HAVE_PCRE_JIT" ngx_feature_test="int jit = 0; + pcre_free_study(NULL); pcre_config(PCRE_CONFIG_JIT, &jit); if (jit != 1) return 1;" . auto/feature |