diff options
| author | Ondřej Surý <ondrej@sury.org> | 2010-10-21 08:52:46 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2010-10-21 08:52:46 +0200 |
| commit | 01fcdff3849c3691d9aaeaab735846ab6d8895ca (patch) | |
| tree | 6460876d356113fa7053df36f2aa00baa7db24a9 /aclocal.m4 | |
| parent | 855a09f4eded707941180c9d90acd17c25e29447 (diff) | |
| download | php-01fcdff3849c3691d9aaeaab735846ab6d8895ca.tar.gz | |
Imported Upstream version 5.3.3upstream/5.3.3
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 27db09c62..1236ccf0e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4 291414 2009-11-29 06:13:22Z rasmus $ +dnl $Id: acinclude.m4 299035 2010-05-05 21:55:44Z felipe $ dnl dnl This file contains local autoconf functions. dnl @@ -1095,7 +1095,7 @@ ifelse([$5],[],,[else $5]) dnl dnl PHP_CHECK_SIZEOF(type, cross-value, extra-headers) dnl -AC_DEFUN(PHP_CHECK_SIZEOF, [ +AC_DEFUN([PHP_CHECK_SIZEOF], [ AC_MSG_CHECKING([size of $1]) _PHP_CHECK_SIZEOF($1, $2, $3, [ AC_DEFINE_UNQUOTED([SIZEOF_]translit($1,a-z,A-Z_), [$]php_cv_sizeof_[]$1, [Size of $1]) @@ -2424,6 +2424,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ echo > ext/iconv/php_have_libiconv.h echo > ext/iconv/php_have_iconv.h echo > ext/iconv/php_php_iconv_impl.h + echo > ext/iconv/php_iconv_aliased_libiconv.h echo > ext/iconv/php_php_iconv_h_path.h echo > ext/iconv/php_iconv_supports_errno.h @@ -2471,6 +2472,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ found_iconv=yes PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) AC_DEFINE(HAVE_LIBICONV,1,[ ]) + PHP_DEFINE([ICONV_ALIASED_LIBICONV],1,[ext/iconv]) + AC_DEFINE([ICONV_ALIASED_LIBICONV],1,[iconv() is aliased to libiconv() in -liconv]) ], [ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [ found_iconv=yes |