diff options
| author | foobar <sniper@php.net> | 2003-08-30 21:57:29 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-08-30 21:57:29 +0000 |
| commit | 4d788fc1e27ac64db748a72ca6fb9577d14936e7 (patch) | |
| tree | 6c03ad9bdda9328beff31aa60949c235baae98e3 /ext/mbstring | |
| parent | c57ecb0e9a75fc2bb849f6887a38838aba7c8737 (diff) | |
| download | php-git-4d788fc1e27ac64db748a72ca6fb9577d14936e7.tar.gz | |
libmbfl is required always
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/config.m4 | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index 017bd75a1b..db054d6f00 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -86,7 +86,8 @@ int main() { return foo(10, "", 3.14); } ]) AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [ - if test "$PHP_LIBMBFL" = "yes"; then + dnl libmbfl is required and can not be disabled + if test "$PHP_LIBMBFL" = "yes" || test "$PHP_LIBMBFL" = "no"; then dnl dnl Bundled libmbfl dnl @@ -191,11 +192,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [ -LPHP_LIBMBFL/lib ]) fi - - dnl - dnl Common libmfl config - dnl - AC_DEFINE([HAVE_LIBMBFL], 1, [whether to have libmbfl support]) ]) dnl @@ -208,9 +204,9 @@ PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support, PHP_ARG_ENABLE([mbregex], [whether to enable multibyte regex support], [ --disable-mbregex MBSTRING: Disable multibyte regex support], yes, no) -PHP_ARG_WITH(libmbfl, [for libmbfl support], -[ --with-libmbfl[=DIR] MBSTRING: Include libmbfl support. DIR is the libmbfl install prefix. - If DIR is not set, the bundled libmbfl will be used.], no, no) +PHP_ARG_WITH(libmbfl, [for external libmbfl], +[ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl install prefix. + If DIR is not set, the bundled libmbfl will be used.], yes, no) if test "$PHP_MBSTRING" != "no"; then AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) @@ -237,9 +233,7 @@ if test "$PHP_MBSTRING" != "no"; then PHP_MBSTRING_SETUP_MBREGEX fi - if test "$PHP_LIBMBFL" != "no"; then - PHP_MBSTRING_SETUP_LIBMBFL - fi - + dnl libmbfl is required + PHP_MBSTRING_SETUP_LIBMBFL PHP_MBSTRING_EXTENSION fi |