moriyoshi Fri Oct 11 13:48:39 2002 EDT
Modified files:
/php4/ext/iconv config.m4 iconv.c
Log:
Index: php4/ext/iconv/config.m4
diff -u php4/ext/iconv/config.m4:1.16 php4/ext/iconv/config.m4:1.17
--- php4/ext/iconv/config.m4:1.16 Fri Oct 11 11:25:36 2002
+++ php4/ext/iconv/config.m4 Fri Oct 11 13:48:39 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.16 2002/10/11 15:25:36 sniper Exp $
+dnl $Id: config.m4,v 1.17 2002/10/11 17:48:39 moriyoshi Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -58,20 +58,22 @@
AC_TRY_COMPILE([#include <iconv.h>],[void __gconv(); int main() { __gconv(); }],
[
AC_MSG_RESULT(yes)
- PHP_DEFINE([ICONV_IMPL],["glibc"])
- AC_DEFINE([ICONV_IMPL],["glibc"],[Which iconv implementation to use])
+ PHP_DEFINE([HAVE_GLIBC_ICONV],1)
+ AC_DEFINE([HAVE_GLIBC_ICONV],1,[glibc's iconv implementation])
+ PHP_DEFINE([PHP_ICONV_IMPL],[\"glibc\"])
+ AC_DEFINE([PHP_ICONV_IMPL],["glibc"],[Which iconv implementation to use])
],[
AC_MSG_RESULT(no)
])
else
case "$iconv_lib_name" in
iconv [)]
- PHP_DEFINE([ICONV_IMPL],["libiconv"])
- AC_DEFINE([ICONV_IMPL],["libiconv"],[Which iconv implementation to use])
+ PHP_DEFINE([PHP_ICONV_IMPL],[\"libiconv\"])
+ AC_DEFINE([PHP_ICONV_IMPL],["libiconv"],[Which iconv implementation to use])
;;
giconv [)]
- PHP_DEFINE([ICONV_IMPL],["giconv"])
- AC_DEFINE([ICONV_IMPL],["giconv"],[Which iconv implementation to use])
+ PHP_DEFINE([PHP_ICONV_IMPL],[\"giconv\"])
+ AC_DEFINE([PHP_ICONV_IMPL],["giconv"],[Which iconv implementation to use])
;;
esac
fi
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.52 php4/ext/iconv/iconv.c:1.53
--- php4/ext/iconv/iconv.c:1.52 Fri Oct 11 13:01:34 2002
+++ php4/ext/iconv/iconv.c Fri Oct 11 13:48:39 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.52 2002/10/11 17:01:34 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.53 2002/10/11 17:48:39 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -42,6 +42,10 @@
#include <iconv.h>
#endif
+#ifdef HAVE_GLIBC_ICONV
+#include <gnu/libc-version.h>
+#endif
+
#ifdef HAVE_LIBICONV
#define LIBICONV_PLUG
#define icv_open(a, b) libiconv_open(a, b)
@@ -118,9 +122,12 @@
((_libiconv_version >> 8) & 0x0f), (_libiconv_version & 0x0f));
version = buf;
}
+#elif HAVE_GLIBC_ICONV
+ version = (char *)gnu_get_libc_version();
#endif
-#ifdef ICONV_IMPL
- REGISTER_STRING_CONSTANT("ICONV_IMPL", ICONV_IMPL, CONST_CS |
CONST_PERSISTENT);
+
+#ifdef PHP_ICONV_IMPL
+ REGISTER_STRING_CONSTANT("ICONV_IMPL", PHP_ICONV_IMPL, CONST_CS |
+CONST_PERSISTENT);
#else
REGISTER_STRING_CONSTANT("ICONV_IMPL", "unknown", CONST_CS | CONST_PERSISTENT);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
