diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 12 insertions, 4 deletions
@@ -59,6 +59,10 @@ Version 8.35-RC1 xx-xxxx-201x 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 diff --git a/configure.ac b/configure.ac index 516936a..02992b8 100644 --- a/configure.ac +++ b/configure.ac @@ -686,11 +686,15 @@ if test "$enable_pcre32" = "yes"; then 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 |