cvs: php-src(PHP_4_3) / acinclude.m4 configure.in /ext/iconv config.m4 php_iconv.h

derick Mon Dec 6 15:37:57 2004 EDT Modified files: (Branch: PHP_4_3) /php-src acinclude.m4 configure.in /php-src/ext/iconv config.m4 php_iconv.h Log: - Install the iconv extension headers to <installpath>/ext/iconv so that external extensions can use them. http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.35&r2=1.218.2.36&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.218.2.35 php-src/acinclude.m4:1.218.2.36 --- php-src/acinclude.m4:1.218.2.35 Mon Jan 19 20:11:40 2004 +++ php-src/acinclude.m4 Mon Dec 6 15:37:56 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.35 2004/01/20 01:11:40 sniper Exp $ +dnl $Id: acinclude.m4,v 1.218.2.36 2004/12/06 20:37:56 derick Exp $ dnl dnl This file contains local autoconf functions. @@ -20,12 +20,12 @@ AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;]) ]) -dnl PHP_DEFINE(WHAT[, value]) +dnl PHP_DEFINE(WHAT[, value[, directory]]) dnl dnl Creates builddir/include/what.h and in there #define WHAT value dnl AC_DEFUN([PHP_DEFINE],[ - [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > include/php_]translit($1,A-Z,a-z)[.h] + [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > ]ifelse([$3],,[include],[$3])[/php_]translit($1,A-Z,a-z)[.h] ]) dnl PHP_INIT_BUILD_SYSTEM @@ -1699,16 +1699,19 @@ found_iconv=no unset ICONV_DIR + echo > ext/iconv/php_have_libiconv.h + echo > ext/iconv/php_have_iconv.h + dnl dnl Check libc first if no path is provided in --with-iconv dnl if test "$PHP_ICONV" = "yes"; then AC_CHECK_FUNC(iconv, [ - PHP_DEFINE(HAVE_ICONV) + PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) found_iconv=yes ],[ AC_CHECK_FUNC(libiconv,[ - PHP_DEFINE(HAVE_LIBICONV) + PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) found_iconv=yes ]) ]) @@ -1741,11 +1744,11 @@ then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes - PHP_DEFINE(HAVE_LIBICONV) + PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) ], [ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [ found_iconv=yes - PHP_DEFINE(HAVE_ICONV) + PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) ], [], [ -L$ICONV_DIR/lib ]) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.135&r2=1.396.2.136&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.135 php-src/configure.in:1.396.2.136 --- php-src/configure.in:1.396.2.135 Tue Nov 23 09:56:29 2004 +++ php-src/configure.in Mon Dec 6 15:37:56 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.135 2004/11/23 14:56:29 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.136 2004/12/06 20:37:56 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -919,7 +919,7 @@ if test "$abs_srcdir" != "$abs_builddir"; then INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend" - INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" + INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/" fi ZEND_EXTRA_LIBS="$LIBS" http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.19.2.4&r2=1.19.2.5&ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.19.2.4 php-src/ext/iconv/config.m4:1.19.2.5 --- php-src/ext/iconv/config.m4:1.19.2.4 Thu Aug 28 02:05:13 2003 +++ php-src/ext/iconv/config.m4 Mon Dec 6 15:37:56 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.19.2.4 2003/08/28 06:05:13 moriyoshi Exp $ +dnl $Id: config.m4,v 1.19.2.5 2004/12/06 20:37:56 derick Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -65,23 +65,26 @@ esac fi + echo > ext/iconv/php_have_bsd_iconv.h + echo > ext/iconv/php_have_glibc_iconv.h + case "$iconv_impl_name" in gnu_libiconv [)] - PHP_DEFINE([PHP_ICONV_IMPL],[\"libiconv\"]) + PHP_DEFINE([PHP_ICONV_IMPL],[\"libiconv\"],[ext/iconv]) AC_DEFINE([PHP_ICONV_IMPL],["libiconv"],[Which iconv implementation to use]) ;; bsd [)] - PHP_DEFINE([HAVE_BSD_ICONV],1) + PHP_DEFINE([HAVE_BSD_ICONV],1,[ext/iconv]) AC_DEFINE([HAVE_BSD_ICONV],1,[Konstantin Chugeuv's iconv implementation]) - PHP_DEFINE([PHP_ICONV_IMPL],[\"BSD iconv\"]) + PHP_DEFINE([PHP_ICONV_IMPL],[\"BSD iconv\"],[ext/iconv]) AC_DEFINE([PHP_ICONV_IMPL],["BSD iconv"],[Which iconv implementation to use]) ;; glibc [)] - PHP_DEFINE([HAVE_GLIBC_ICONV],1) + PHP_DEFINE([HAVE_GLIBC_ICONV],1,[ext/iconv]) AC_DEFINE([HAVE_GLIBC_ICONV],1,[glibc's iconv implementation]) - PHP_DEFINE([PHP_ICONV_IMPL],[\"glibc\"]) + PHP_DEFINE([PHP_ICONV_IMPL],[\"glibc\"],[ext/iconv]) AC_DEFINE([PHP_ICONV_IMPL],["glibc"],[Which iconv implementation to use]) ;; esac @@ -106,11 +109,11 @@ } ],[ AC_MSG_RESULT(yes) - PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1) + PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1,[ext/iconv]) AC_DEFINE([ICONV_SUPPORTS_ERRNO],1,[Whether iconv supports error no or not]) ],[ AC_MSG_RESULT(no) - PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0) + PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0,[ext/iconv]) AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or not]) ]) @@ -120,7 +123,7 @@ #include FOO ], [], [ AC_MSG_RESULT([yes]) - PHP_DEFINE([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>]) + PHP_DEFINE([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>],[ext/iconv]) AC_DEFINE_UNQUOTED([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>], [Path to iconv.h]) ], [ AC_MSG_RESULT([no]) http://cvs.php.net/diff.php/php-src/ext/iconv/php_iconv.h?r1=1.12.2.7&r2=1.12.2.8&ty=u Index: php-src/ext/iconv/php_iconv.h diff -u php-src/ext/iconv/php_iconv.h:1.12.2.7 php-src/ext/iconv/php_iconv.h:1.12.2.8 --- php-src/ext/iconv/php_iconv.h:1.12.2.7 Tue Nov 23 07:14:20 2004 +++ php-src/ext/iconv/php_iconv.h Mon Dec 6 15:37:56 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Revision: 1.12.2.7 $ */ +/* $Revision: 1.12.2.8 $ */ #ifndef PHP_ICONV_H #define PHP_ICONV_H @@ -33,13 +33,13 @@ #endif #ifdef PHP_ATOM_INC -#include "php_have_iconv.h" -#include "php_have_libiconv.h" -#include "php_have_glibc_iconv.h" -#include "php_have_bsd_iconv.h" -#include "php_iconv_supports_errno.h" -#include "php_php_iconv_impl.h" -#include "php_php_iconv_h_path.h" +#include "ext/iconv/php_have_iconv.h" +#include "ext/iconv/php_have_libiconv.h" +#include "ext/iconv/php_have_glibc_iconv.h" +#include "ext/iconv/php_have_bsd_iconv.h" +#include "ext/iconv/php_iconv_supports_errno.h" +#include "ext/iconv/php_php_iconv_impl.h" +#include "ext/iconv/php_php_iconv_h_path.h" #endif