diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-10-04 12:23:11 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-10-04 12:23:11 +0000 |
| commit | 10961114adf8a6c6f271e04d0ec670cf5155cb1b (patch) | |
| tree | 12f4d91217ff49d474951dadbd71265f7a2e6e87 | |
| parent | 069e311c603967da0fc7a56af1f640d4a6c68b33 (diff) | |
| download | php-git-10961114adf8a6c6f271e04d0ec670cf5155cb1b.tar.gz | |
Fix autoconf(2.13) build
| -rw-r--r-- | ext/standard/config.m4 | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 23a691ac87..1fd4bf2122 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -297,19 +297,37 @@ PHP_CHECK_FUNC(res_nsend, resolv, bind, socket) PHP_CHECK_FUNC(dn_expand, resolv, bind, socket) dnl already done PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket) -AC_CHECK_HEADERS([wchar.h]) -AC_CHECK_FUNCS([mblen]) -AC_CHECK_FUNCS([mbrlen mbsinit],,,[ +dnl +dnl Check for i18n capabilities +dnl +AC_DEFUN([PHP_CHECK_I18N_FUNCS],[ + AC_CHECK_HEADERS([wchar.h]) + AC_CHECK_FUNCS([mblen]) + AC_CHECK_FUNCS([mbrlen mbsinit],,,[ #ifdef HAVE_WCHAR_H # include <wchar.h> #endif -]) -AC_CHECK_TYPES([mbstate_t],,,[ + ]) + AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],[ + AC_TRY_COMPILE([ #ifdef HAVE_WCHAR_H # include <wchar.h> #endif + ],[ +int __tmp__() { mbstate_t a; } + ],[ + ac_cv_type_mbstate_t=yes + ],[ + ac_cv_type_mbstate_t=no + ]) + ]) + if test "$ac_cv_type_mbstate_t" = "yes"; then + AC_DEFINE([HAVE_MBSTATE_T], 1, [Define if your system has mbstate_t in wchar.h]) + fi ]) +PHP_CHECK_I18N_FUNCS + PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ |