[nginx] svn commit: r5042 - in branches/stable-1.2: . auto/lib/pcre

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-10 03:18:08 +0000 (Sun, 10 Feb 2013)
New Revision: 5042
URL: http://trac.nginx.org/nginx/changeset/5042/nginx

Log:
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.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/auto/lib/pcre/conf

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-02-10 03:08:42 UTC (rev 5041)
+++ branches/stable-1.2	2013-02-10 03:18:08 UTC (rev 5042)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4964,4973,4978,4984,5011
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961,4964,4973,4978,4984,5011
\ No newline at end of property
Modified: branches/stable-1.2/auto/lib/pcre/conf
===================================================================
--- branches/stable-1.2/auto/lib/pcre/conf	2013-02-10 03:08:42 UTC (rev 5041)
+++ branches/stable-1.2/auto/lib/pcre/conf	2013-02-10 03:18:08 UTC (rev 5042)
@@ -172,6 +172,7 @@
             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