archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

libmbfl is required always

Browse source
This commit is contained in:
foobar 2003-08-30 21:57:29 +00:00
parent c57ecb0e9a
commit 4d788fc1e2
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ext/mbstring/config.m4
View file

@ -86,7 +86,8 @@ int main() { return foo(10, "", 3.14); }
]) ])
AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [ 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
dnl Bundled libmbfl dnl Bundled libmbfl
dnl dnl
@ -191,11 +192,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
-LPHP_LIBMBFL/lib -LPHP_LIBMBFL/lib
]) ])
fi fi
dnl
dnl Common libmfl config
dnl
AC_DEFINE([HAVE_LIBMBFL], 1, [whether to have libmbfl support])
]) ])
dnl 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], PHP_ARG_ENABLE([mbregex], [whether to enable multibyte regex support],
[ --disable-mbregex MBSTRING: Disable multibyte regex support], yes, no) [ --disable-mbregex MBSTRING: Disable multibyte regex support], yes, no)
PHP_ARG_WITH(libmbfl, [for libmbfl support], PHP_ARG_WITH(libmbfl, [for external libmbfl],
[ --with-libmbfl[=DIR] MBSTRING: Include libmbfl support. DIR is the libmbfl install prefix. [ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl install prefix.
If DIR is not set, the bundled libmbfl will be used.], no, no) If DIR is not set, the bundled libmbfl will be used.], yes, no)
if test "$PHP_MBSTRING" != "no"; then if test "$PHP_MBSTRING" != "no"; then
AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) 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 PHP_MBSTRING_SETUP_MBREGEX
fi fi
if test "$PHP_LIBMBFL" != "no"; then dnl libmbfl is required
PHP_MBSTRING_SETUP_LIBMBFL PHP_MBSTRING_SETUP_LIBMBFL
fi
PHP_MBSTRING_EXTENSION PHP_MBSTRING_EXTENSION
fi fi