moriyoshi Sat Oct 4 08:23:12 2003 EDT
Modified files:
/php-src/ext/standard config.m4
Log:
Fix autoconf(2.13) build
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.65 php-src/ext/standard/config.m4:1.66
--- php-src/ext/standard/config.m4:1.65 Fri Oct 3 22:51:19 2003
+++ php-src/ext/standard/config.m4 Sat Oct 4 08:23:11 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.65 2003/10/04 02:51:19 moriyoshi Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.66 2003/10/04 12:23:11 moriyoshi Exp $ -*- sh -*-
divert(3)dnl
@@ -297,18 +297,36 @@
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 \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
