Revision: 1439
http://vcs.pcre.org/viewvc?view=rev&revision=1439
Author: ph10
Date: 2014-01-10 16:25:55 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
Only test for pthreads when not under Windows.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/configure.ac
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2014-01-10 16:13:10 UTC (rev 1438)
+++ code/trunk/ChangeLog 2014-01-10 16:25:55 UTC (rev 1439)
@@ -59,6 +59,10 @@
the alternative cases were added to the class. For example, s and \x{17f}
are both alternative cases for S: the class [RST] was handled correctly,
but [R-T] was not.
+
+13. The configure.ac file always checked for pthread support when JIT was
+ enabled. This is not used in Windows, so I have put this test inside a
+ check for the presence of windows.h (which was already tested for).
Version 8.34 15-December-2013
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2014-01-10 16:13:10 UTC (rev 1438)
+++ code/trunk/configure.ac 2014-01-10 16:25:55 UTC (rev 1439)
@@ -686,11 +686,15 @@
Define to any value to enable the 32 bit PCRE library.])
fi
+# Unless running under Windows, JIT support requires pthreads.
+
if test "$enable_jit" = "yes"; then
- AX_PTHREAD([], [AC_MSG_ERROR([JIT support requires pthreads])])
- CC="$PTHREAD_CC"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
- LIBS="$PTHREAD_LIBS $LIBS"
+ if test "$HAVE_WINDOWS_H" != "1"; then
+ AX_PTHREAD([], [AC_MSG_ERROR([JIT support requires pthreads])])
+ CC="$PTHREAD_CC"
+ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ fi
AC_DEFINE([SUPPORT_JIT], [], [
Define to any value to enable support for Just-In-Time compiling.])
else
