]> granicus.if.org Git - php/commitdiff
Allow to disable pcre.jit when system library is used
authorRemi Collet <remi@php.net>
Thu, 4 Oct 2018 09:45:35 +0000 (11:45 +0200)
committerRemi Collet <remi@php.net>
Thu, 4 Oct 2018 09:45:35 +0000 (11:45 +0200)
as it is for now broken on some arch (s390x...)

ext/pcre/config0.m4

index dd1b7d55aa691445421d7e04c5b3e57c313bfcf6..3f7f04d4fc60b7fc1e88f3b5020da04a494e3036 100644 (file)
@@ -47,13 +47,15 @@ PHP_ARG_WITH(pcre-jit,,[  --with-pcre-jit         Enable PCRE JIT functionality
       fi
     fi
 
-    PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8,
-    [
-      AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
-    ],[
-    ],[
-      $PCRE2_LIB
-    ])
+    if test "$PHP_PCRE_JIT" != "no"; then
+      PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8,
+      [
+        AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
+      ],[
+      ],[
+        $PCRE2_LIB
+      ])
+    fi
 
     PHP_EVAL_INCLINE($PCRE2_INC)
     PHP_EVAL_LIBLINE($PCRE2_LIB)