7aca2531e2
There are many greater changes including: - New module ffi - Remove interbase module - Remove recode module - Remove wddx module - Many modules changes the build switches - Many modules changes the config format, so patches needed to be recreated Special thanks to tobik and ale for their support. Reviewed by: tobik, ale, joneum Sponsored by: PHP Update Service Differential Revision: https://reviews.freebsd.org/D21349
48 lines
1.2 KiB
Plaintext
48 lines
1.2 KiB
Plaintext
--- config.m4.orig 2019-08-20 14:09:27 UTC
|
|
+++ config.m4
|
|
@@ -105,6 +105,13 @@ PHP_ARG_WITH([imap-ssl],
|
|
[no],
|
|
[no])
|
|
|
|
+PHP_ARG_WITH([pcre-dir],
|
|
+ [pcre install prefix],
|
|
+ [AS_HELP_STRING([[--with-pcre-dir]],
|
|
+ [IMAP: pcre install prefix])],
|
|
+ [no],
|
|
+ [no])
|
|
+
|
|
if test "$PHP_IMAP" != "no"; then
|
|
PHP_SUBST(IMAP_SHARED_LIBADD)
|
|
PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
|
|
@@ -120,6 +127,30 @@ if test "$PHP_IMAP" != "no"; then
|
|
fi
|
|
done
|
|
|
|
+ dnl This is PECL build, check if bundled PCRE library is used
|
|
+ old_CPPFLAGS=$CPPFLAGS
|
|
+ CPPFLAGS=$INCLUDES
|
|
+ AC_EGREP_CPP(yes,[
|
|
+#include <main/php_config.h>
|
|
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
|
|
+yes
|
|
+#endif
|
|
+ ],[
|
|
+ PHP_PCRE_REGEX=yes
|
|
+ ],[
|
|
+ AC_EGREP_CPP(yes,[
|
|
+#include <main/php_config.h>
|
|
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
|
|
+yes
|
|
+#endif
|
|
+ ],[
|
|
+ PHP_PCRE_REGEX=pecl
|
|
+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
|
|
+ ],[
|
|
+ PHP_PCRE_REGEX=no
|
|
+ ])
|
|
+ ])
|
|
+
|
|
dnl Check for c-client version 2004
|
|
AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
|
|
AC_DEFINE(HAVE_IMAP2004,1,[ ])
|