derick Mon Dec 6 15:38:55 2004 EDT
Modified files: (Branch: PHP_5_0)
/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.271&r2=1.271.2.1&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271 php-src/acinclude.m4:1.271.2.1
--- php-src/acinclude.m4:1.271 Fri Mar 26 21:03:44 2004
+++ php-src/acinclude.m4 Mon Dec 6 15:38:55 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271 2004/03/27 02:03:44 abies Exp $
+dnl $Id: acinclude.m4,v 1.271.2.1 2004/12/06 20:38:55 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
@@ -1695,16 +1695,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
])
])
@@ -1737,11 +1740,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.514.2.17&r2=1.514.2.18&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.17 php-src/configure.in:1.514.2.18
--- php-src/configure.in:1.514.2.17 Wed Dec 1 09:44:54 2004
+++ php-src/configure.in Mon Dec 6 15:38:55 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.17 2004/12/01 14:44:54 derick Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.514.2.18 2004/12/06 20:38:55 derick Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -949,7 +949,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.27&r2=1.27.2.1&ty=u
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.27 php-src/ext/iconv/config.m4:1.27.2.1
--- php-src/ext/iconv/config.m4:1.27 Wed Jul 14 05:54:02 2004
+++ php-src/ext/iconv/config.m4 Mon Dec 6 15:38:55 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.27 2004/07/14 09:54:02 derick Exp $
+dnl $Id: config.m4,v 1.27.2.1 2004/12/06 20:38:55 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.22.2.4&r2=1.22.2.5&ty=u
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.22.2.4
php-src/ext/iconv/php_iconv.h:1.22.2.5
--- php-src/ext/iconv/php_iconv.h:1.22.2.4 Wed Nov 24 18:12:57 2004
+++ php-src/ext/iconv/php_iconv.h Mon Dec 6 15:38:55 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Revision: 1.22.2.4 $ */
+/* $Revision: 1.22.2.5 $ */
#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
