Changeset View
Changeset View
Standalone View
Standalone View
converters/php72-mbstring/files/patch-config.m4
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- config.m4.orig 2009-11-25 02:30:06.000000000 +0100 | |||||
+++ config.m4 2010-04-12 09:59:54.000000000 +0200 | |||||
@@ -43,6 +43,30 @@ | |||||
PHP_ADD_INCLUDE([$ext_builddir/$dir]) | |||||
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 | |||||
+ ]) | |||||
+ ]) | |||||
+ | |||||
if test "$ext_shared" = "no"; then | |||||
PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) | |||||
out="php_config.h" | |||||
@@ -80,7 +104,6 @@ | |||||
int foo(int x, ...) { | |||||
va_list va; | |||||
va_start(va, x); | |||||
- va_arg(va, int); | |||||
va_arg(va, char *); | |||||
va_arg(va, double); | |||||
return 0; | |||||
@@ -347,6 +370,9 @@ | |||||
[ --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, | |||||
+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) | |||||
+ | |||||
if test "$PHP_MBSTRING" != "no"; then | |||||
AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) | |||||