Changeset View
Changeset View
Standalone View
Standalone View
converters/php74-mbstring/files/patch-config.m4
| --- config.m4.orig 2018-09-25 09:08:02 UTC | --- config.m4.orig 2019-08-06 06:54:10 UTC | ||||
| +++ config.m4 | +++ config.m4 | ||||
| @@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ | @@ -37,6 +37,31 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ | ||||
| PHP_ADD_INCLUDE([$ext_builddir/$dir]) | |||||
| done | |||||
| out="php_config.h" | |||||
| + dnl This is PECL build, check if bundled PCRE library is used | + dnl This is PECL build, check if bundled PCRE library is used | ||||
| + old_CPPFLAGS=$CPPFLAGS | + old_CPPFLAGS=$CPPFLAGS | ||||
| + CPPFLAGS=$INCLUDES | + CPPFLAGS=$INCLUDES | ||||
| Context not available. | |||||
| + ]) | + ]) | ||||
| + ]) | + ]) | ||||
| + | + | ||||
| if test "$ext_shared" = "no"; then | + | ||||
| PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) | if test "$ext_shared" != "no" && test -f "$ext_builddir/config.h.in"; then | ||||
| out="php_config.h" | out="$abs_builddir/config.h" | ||||
| @@ -83,7 +107,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ | fi | ||||
| int foo(int x, ...) { | @@ -200,6 +225,9 @@ PHP_ARG_ENABLE([mbregex], | ||||
| va_list va; | [yes], | ||||
| va_start(va, x); | [no]) | ||||
| - va_arg(va, int); | |||||
| va_arg(va, char *); | |||||
| va_arg(va, double); | |||||
| return 0; | |||||
| @@ -334,6 +357,9 @@ PHP_ARG_WITH(onig, [for external oniguru | |||||
| [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. | |||||
| If DIR is not set, the bundled oniguruma will be used], no, no) | |||||
| +PHP_ARG_WITH(pcre-dir, pcre install prefix, | +PHP_ARG_WITH(pcre-dir, pcre install prefix, | ||||
| +[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) | +[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) | ||||
| Context not available. | |||||