derick Mon Dec 6 15:39:20 2004 EDT
Modified files:
/php-src acinclude.m4 configure.in
/php-src/ext/iconv config.m4 php_iconv.h
Log:
- MF43: 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.276&r2=1.277&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.276 php-src/acinclude.m4:1.277
--- php-src/acinclude.m4:1.276 Tue Nov 9 15:58:22 2004
+++ php-src/acinclude.m4 Mon Dec 6 15:39:20 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.276 2004/11/09 20:58:22 andrei Exp $
+dnl $Id: acinclude.m4,v 1.277 2004/12/06 20:39:20 derick Exp $
dnl
dnl This file contains local autoconf functions.
@@ -21,12 +21,12 @@
])
-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
@@ -1692,16 +1692,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
])
])
@@ -1734,11 +1737,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/$PHP_LIBDIR
])
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.526&r2=1.527&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.526 php-src/configure.in:1.527
--- php-src/configure.in:1.526 Mon Nov 15 08:42:21 2004
+++ php-src/configure.in Mon Dec 6 15:39:20 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.526 2004/11/15 13:42:21 derick Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.527 2004/12/06 20:39:20 derick Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -981,7 +981,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.28&r2=1.29&ty=u
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.28 php-src/ext/iconv/config.m4:1.29
--- php-src/ext/iconv/config.m4:1.28 Wed Nov 3 09:32:50 2004
+++ php-src/ext/iconv/config.m4 Mon Dec 6 15:39:20 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28 2004/11/03 14:32:50 jorton Exp $
+dnl $Id: config.m4,v 1.29 2004/12/06 20:39:20 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.26&r2=1.27&ty=u
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.26 php-src/ext/iconv/php_iconv.h:1.27
--- php-src/ext/iconv/php_iconv.h:1.26 Wed Nov 24 18:12:18 2004
+++ php-src/ext/iconv/php_iconv.h Mon Dec 6 15:39:20 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Revision: 1.26 $ */
+/* $Revision: 1.27 $ */
#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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
