Attachment #151781 for bug #206970




    AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])


    PHP_MBSTRING_ADD_BASE_SOURCES([php_mbregex.c])
    if test "$PHP_ONIG_DIR" = "bundled"; then
        if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
          AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack])
        fi

        PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
        PHP_MBSTRING_ADD_BUILD_DIR([oniguruma])
        PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc])
        PHP_MBSTRING_ADD_INCLUDE([oniguruma])
        PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h])

        PHP_MBSTRING_ADD_SOURCES([
          oniguruma/regcomp.c
          oniguruma/regerror.c
          oniguruma/regexec.c
          oniguruma/reggnu.c
          oniguruma/regparse.c
          oniguruma/regenc.c
          oniguruma/regext.c
          oniguruma/regsyntax.c
          oniguruma/regtrav.c
          oniguruma/regversion.c
          oniguruma/st.c
          oniguruma/enc/unicode.c
          oniguruma/enc/ascii.c
          oniguruma/enc/utf8.c
          oniguruma/enc/euc_jp.c
          oniguruma/enc/euc_tw.c
          oniguruma/enc/euc_kr.c
          oniguruma/enc/sjis.c
          oniguruma/enc/iso8859_1.c
          oniguruma/enc/iso8859_2.c
          oniguruma/enc/iso8859_3.c
          oniguruma/enc/iso8859_4.c
          oniguruma/enc/iso8859_5.c
          oniguruma/enc/iso8859_6.c
          oniguruma/enc/iso8859_7.c
          oniguruma/enc/iso8859_8.c
          oniguruma/enc/iso8859_9.c
          oniguruma/enc/iso8859_10.c
          oniguruma/enc/iso8859_11.c
          oniguruma/enc/iso8859_13.c
          oniguruma/enc/iso8859_14.c
          oniguruma/enc/iso8859_15.c
          oniguruma/enc/iso8859_16.c
          oniguruma/enc/koi8.c
          oniguruma/enc/koi8_r.c
          oniguruma/enc/big5.c
          oniguruma/enc/utf16_be.c
          oniguruma/enc/utf16_le.c
          oniguruma/enc/utf32_be.c
          oniguruma/enc/utf32_le.c
          oniguruma/enc/gb18030.c
        ])
        PHP_ADD_INCLUDE([oniguruma])
    else
      if ! test -f $PHP_ONIG_DIR/include/oniguruma.h; then
        AC_MSG_ERROR([Could not find oniguruma.h in $PHP_ONIG_DIR/include])
      fi
      ONIG_LIB=$PHP_ONIG_DIR/$PHP_LIBDIR
      if ! test -f $ONIG_LIB/libonig.$SHLIB_SUFFIX_NAME; then
        AC_MSG_ERROR([Could not find libonig.$SHLIB_SUFFIX_NAME in $ONIG_LIB])
      fi
      PHP_ADD_LIBRARY_WITH_PATH(onig, $PHP_ONIG_DIR/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD)
      PHP_SUBST(MBSTRING_SHARED_LIBADD)
      PHP_ADD_INCLUDE([$PHP_ONIG_DIR/include])
    fi

    PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
    PHP_MBSTRING_ADD_BUILD_DIR([oniguruma])
    PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc])
    PHP_MBSTRING_ADD_INCLUDE([oniguruma])
    PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h])

    PHP_MBSTRING_ADD_BASE_SOURCES([php_mbregex.c])
    PHP_MBSTRING_ADD_SOURCES([
      oniguruma/regcomp.c
      oniguruma/regerror.c
      oniguruma/regexec.c
      oniguruma/reggnu.c
      oniguruma/regparse.c
      oniguruma/regenc.c
      oniguruma/regext.c
      oniguruma/regsyntax.c
      oniguruma/regtrav.c
      oniguruma/regversion.c
      oniguruma/st.c
      oniguruma/enc/unicode.c
      oniguruma/enc/ascii.c
      oniguruma/enc/utf8.c
      oniguruma/enc/euc_jp.c
      oniguruma/enc/euc_tw.c
      oniguruma/enc/euc_kr.c
      oniguruma/enc/sjis.c
      oniguruma/enc/iso8859_1.c
      oniguruma/enc/iso8859_2.c
      oniguruma/enc/iso8859_3.c
      oniguruma/enc/iso8859_4.c
      oniguruma/enc/iso8859_5.c
      oniguruma/enc/iso8859_6.c
      oniguruma/enc/iso8859_7.c
      oniguruma/enc/iso8859_8.c
      oniguruma/enc/iso8859_9.c
      oniguruma/enc/iso8859_10.c
      oniguruma/enc/iso8859_11.c
      oniguruma/enc/iso8859_13.c
      oniguruma/enc/iso8859_14.c
      oniguruma/enc/iso8859_15.c
      oniguruma/enc/iso8859_16.c
      oniguruma/enc/koi8.c
      oniguruma/enc/koi8_r.c
      oniguruma/enc/big5.c
      oniguruma/enc/utf16_be.c
      oniguruma/enc/utf16_le.c
      oniguruma/enc/utf32_be.c
      oniguruma/enc/utf32_le.c
      oniguruma/enc/gb18030.c
    ])
  fi
])


[  --disable-mbregex-backtrack
                            MBSTRING: Disable multibyte regex backtrack check], yes, no)

PHP_ARG_WITH([onig-dir], [for the type and location of liboniguruma],
[  --with-onig-dir[=DIR]         MBSTRING: Use external liboniguruma. DIR is the libonig base install directory [BUNDLED]], bundled, no)


PHP_ARG_WITH(libmbfl, [for external libmbfl],
[  --with-libmbfl[=DIR]      MBSTRING: Use external libmbfl.  DIR is the libmbfl base
                            install directory [BUNDLED]], no, no)

  dnl libmbfl is required
  PHP_MBSTRING_SETUP_LIBMBFL
  PHP_MBSTRING_EXTENSION
  if test "$PHP_ONIG_DIR" = "bundled"; then
    PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/oniguruma.h oniguruma/php_onig_compat.h])
  else
    PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/php_onig_compat.h])
  fi
fi

# vim600: sts=2 sw=2 et

Lines 159-168 Link Here

(-)a/ext/mbstring/php_mbregex.c (-4 lines)
159	{	159	{
160	"EUC-KR\0EUCKR\0EUC_KR\0",	160	"EUC-KR\0EUCKR\0EUC_KR\0",
161	ONIG_ENCODING_EUC_KR	161	ONIG_ENCODING_EUC_KR
162	},
163	{
164	"KOI8\0KOI-8\0",
165	ONIG_ENCODING_KOI8
166	},	162	},
167	{	163	{
168	"KOI8R\0KOI8-R\0KOI-8R\0",	164	"KOI8R\0KOI8-R\0KOI-8R\0",

Lines 25-31 Link Here

(-)a/ext/mbstring/php_mbregex.h (-1 / +2 lines)
25		25
26	#include "php.h"	26	#include "php.h"
27	#include "zend.h"	27	#include "zend.h"
28	#include "oniguruma/oniguruma.h"	28	#include "oniguruma/php_onig_compat.h"
		29	#include <oniguruma.h>
29		30
30	/* {{{ PHP_MBREGEX_GLOBALS */	31	/* {{{ PHP_MBREGEX_GLOBALS */
31	#define PHP_MBREGEX_GLOBALS \	32	#define PHP_MBREGEX_GLOBALS \

Return to bug 206970

Lines 99-158 Link Here

(-)a/ext/mbstring/config.m4 (-54 / +76 lines)
99	AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])	99	AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])
100		100
101		101
102	if test "$PHP_MBREGEX_BACKTRACK" != "no"; then	102	PHP_MBSTRING_ADD_BASE_SOURCES([php_mbregex.c])
103	AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack])	103	if test "$PHP_ONIG_DIR" = "bundled"; then
		104	if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
		105	AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check multibyte regex backtrack])
		106	fi
		107
		108	PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
		109	PHP_MBSTRING_ADD_BUILD_DIR([oniguruma])
		110	PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc])
		111	PHP_MBSTRING_ADD_INCLUDE([oniguruma])
		112	PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h])
		113
		114	PHP_MBSTRING_ADD_SOURCES([
		115	oniguruma/regcomp.c
		116	oniguruma/regerror.c
		117	oniguruma/regexec.c
		118	oniguruma/reggnu.c
		119	oniguruma/regparse.c
		120	oniguruma/regenc.c
		121	oniguruma/regext.c
		122	oniguruma/regsyntax.c
		123	oniguruma/regtrav.c
		124	oniguruma/regversion.c
		125	oniguruma/st.c
		126	oniguruma/enc/unicode.c
		127	oniguruma/enc/ascii.c
		128	oniguruma/enc/utf8.c
		129	oniguruma/enc/euc_jp.c
		130	oniguruma/enc/euc_tw.c
		131	oniguruma/enc/euc_kr.c
		132	oniguruma/enc/sjis.c
		133	oniguruma/enc/iso8859_1.c
		134	oniguruma/enc/iso8859_2.c
		135	oniguruma/enc/iso8859_3.c
		136	oniguruma/enc/iso8859_4.c
		137	oniguruma/enc/iso8859_5.c
		138	oniguruma/enc/iso8859_6.c
		139	oniguruma/enc/iso8859_7.c
		140	oniguruma/enc/iso8859_8.c
		141	oniguruma/enc/iso8859_9.c
		142	oniguruma/enc/iso8859_10.c
		143	oniguruma/enc/iso8859_11.c
		144	oniguruma/enc/iso8859_13.c
		145	oniguruma/enc/iso8859_14.c
		146	oniguruma/enc/iso8859_15.c
		147	oniguruma/enc/iso8859_16.c
		148	oniguruma/enc/koi8.c
		149	oniguruma/enc/koi8_r.c
		150	oniguruma/enc/big5.c
		151	oniguruma/enc/utf16_be.c
		152	oniguruma/enc/utf16_le.c
		153	oniguruma/enc/utf32_be.c
		154	oniguruma/enc/utf32_le.c
		155	oniguruma/enc/gb18030.c
		156	])
		157	PHP_ADD_INCLUDE([oniguruma])
		158	else
		159	if ! test -f $PHP_ONIG_DIR/include/oniguruma.h; then
		160	AC_MSG_ERROR([Could not find oniguruma.h in $PHP_ONIG_DIR/include])
		161	fi
		162	ONIG_LIB=$PHP_ONIG_DIR/$PHP_LIBDIR
		163	if ! test -f $ONIG_LIB/libonig.$SHLIB_SUFFIX_NAME; then
		164	AC_MSG_ERROR([Could not find libonig.$SHLIB_SUFFIX_NAME in $ONIG_LIB])
		165	fi
		166	PHP_ADD_LIBRARY_WITH_PATH(onig, $PHP_ONIG_DIR/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD)
		167	PHP_SUBST(MBSTRING_SHARED_LIBADD)
168	PHP_ADD_INCLUDE([$PHP_ONIG_DIR/include])
104	fi	169	fi
105
106	PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY])
107	PHP_MBSTRING_ADD_BUILD_DIR([oniguruma])
108	PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc])
109	PHP_MBSTRING_ADD_INCLUDE([oniguruma])
110	PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h])
111
112	PHP_MBSTRING_ADD_BASE_SOURCES([php_mbregex.c])
113	PHP_MBSTRING_ADD_SOURCES([
114	oniguruma/regcomp.c
115	oniguruma/regerror.c
116	oniguruma/regexec.c
117	oniguruma/reggnu.c
118	oniguruma/regparse.c
119	oniguruma/regenc.c
120	oniguruma/regext.c
121	oniguruma/regsyntax.c
122	oniguruma/regtrav.c
123	oniguruma/regversion.c
124	oniguruma/st.c
125	oniguruma/enc/unicode.c
126	oniguruma/enc/ascii.c
127	oniguruma/enc/utf8.c
128	oniguruma/enc/euc_jp.c
129	oniguruma/enc/euc_tw.c
130	oniguruma/enc/euc_kr.c
131	oniguruma/enc/sjis.c
132	oniguruma/enc/iso8859_1.c
133	oniguruma/enc/iso8859_2.c
134	oniguruma/enc/iso8859_3.c
135	oniguruma/enc/iso8859_4.c
136	oniguruma/enc/iso8859_5.c
137	oniguruma/enc/iso8859_6.c
138	oniguruma/enc/iso8859_7.c
139	oniguruma/enc/iso8859_8.c
140	oniguruma/enc/iso8859_9.c
141	oniguruma/enc/iso8859_10.c
142	oniguruma/enc/iso8859_11.c
143	oniguruma/enc/iso8859_13.c
144	oniguruma/enc/iso8859_14.c
145	oniguruma/enc/iso8859_15.c
146	oniguruma/enc/iso8859_16.c
147	oniguruma/enc/koi8.c
148	oniguruma/enc/koi8_r.c
149	oniguruma/enc/big5.c
150	oniguruma/enc/utf16_be.c
151	oniguruma/enc/utf16_le.c
152	oniguruma/enc/utf32_be.c
153	oniguruma/enc/utf32_le.c
154	oniguruma/enc/gb18030.c
155	])
156	fi	170	fi
157	])	171	])
158		172
Lines 286-291 Link Here
286	[ --disable-mbregex-backtrack	300	[ --disable-mbregex-backtrack
287	MBSTRING: Disable multibyte regex backtrack check], yes, no)	301	MBSTRING: Disable multibyte regex backtrack check], yes, no)
288		302
		303	PHP_ARG_WITH([onig-dir], [for the type and location of liboniguruma],
		304	[ --with-onig-dir[=DIR] MBSTRING: Use external liboniguruma. DIR is the libonig base install directory [BUNDLED]], bundled, no)
		305
		306
289	PHP_ARG_WITH(libmbfl, [for external libmbfl],	307	PHP_ARG_WITH(libmbfl, [for external libmbfl],
290	[ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl base	308	[ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl base
291	install directory [BUNDLED]], no, no)	309	install directory [BUNDLED]], no, no)
Lines 302-308 Link Here
302	dnl libmbfl is required	320	dnl libmbfl is required
303	PHP_MBSTRING_SETUP_LIBMBFL	321	PHP_MBSTRING_SETUP_LIBMBFL
304	PHP_MBSTRING_EXTENSION	322	PHP_MBSTRING_EXTENSION
305	PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/oniguruma.h oniguruma/php_onig_compat.h])	323	if test "$PHP_ONIG_DIR" = "bundled"; then
		324	PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/oniguruma.h oniguruma/php_onig_compat.h])
		325	else
		326	PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h oniguruma/php_onig_compat.h])
		327	fi
306	fi	328	fi
307		329
308	# vim600: sts=2 sw=2 et	330	# vim600: sts=2 sw=2 et