[Pcre-svn] [1750] code/trunk: Fix --enable-jit=auto for out-…

Page principale
Supprimer ce message
Auteur: Subversion repository
Date:  
À: pcre-svn
Sujet: [Pcre-svn] [1750] code/trunk: Fix --enable-jit=auto for out-of-tree builds.
Revision: 1750
          http://vcs.pcre.org/viewvc?view=rev&revision=1750
Author:   ph10
Date:     2019-03-01 16:24:05 +0000 (Fri, 01 Mar 2019)
Log Message:
-----------
Fix --enable-jit=auto for out-of-tree builds.


Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/configure.ac


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2019-02-23 16:46:01 UTC (rev 1749)
+++ code/trunk/ChangeLog    2019-03-01 16:24:05 UTC (rev 1750)
@@ -5,6 +5,14 @@
 development is happening in the PCRE2 10.xx series.



+Version 8.44-RC1 01 March-2019
+------------------------------
+
+1. Setting --enable-jit=auto for an out-of-tree build failed because the
+source directory wasn't in the search path for AC_TRY_COMPILE always. Patch
+from Ross Burton.
+
+
Version 8.43 23-February-2019
-----------------------------


Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac    2019-02-23 16:46:01 UTC (rev 1749)
+++ code/trunk/configure.ac    2019-03-01 16:24:05 UTC (rev 1750)
@@ -9,9 +9,9 @@
 dnl be defined as -RC2, for example. For real releases, it should be empty.


m4_define(pcre_major, [8])
-m4_define(pcre_minor, [43])
-m4_define(pcre_prerelease, [])
-m4_define(pcre_date, [2019-02-23])
+m4_define(pcre_minor, [44])
+m4_define(pcre_prerelease, [-RC1])
+m4_define(pcre_date, [2019-03-01])

# NOTE: The CMakeLists.txt file searches for the above variables in the first
# 50 lines of this file. Please update that if the variables above are moved.
@@ -159,6 +159,8 @@

if test "$enable_jit" = "auto"; then
AC_LANG(C)
+ SAVE_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=-I$srcdir
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#define SLJIT_CONFIG_AUTO 1
#include "sljit/sljitConfigInternal.h"
@@ -165,6 +167,7 @@
#if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
#error unsupported
#endif]])], enable_jit=yes, enable_jit=no)
+ CPPFLAGS=$SAVE_CPPFLAGS
fi

# Handle --disable-pcregrep-jit (enabled by default)