added a option to select character encoding for sqlite.

diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4
index b988175178e1a67d0254ae89b870f99e6b5dccca..e23ccbbf3548545135d5c05f4bcadf11472fe1b9 100644 (file)
--- a/ext/sqlite/config.m4
+++ b/ext/sqlite/config.m4
@@ -2,6 +2,9 @@ dnl $Id$
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
+PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: ISO-8859-1),
+[  --enable-sqlite-utf8    Enable UTF-8 support], no, no)
+
 PHP_ARG_WITH(sqlite, for sqlite support,
 [  --with-sqlite           Include sqlite support], yes)
 
@@ -69,9 +72,12 @@ if test "$PHP_SQLITE" != "no"; then
     AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
     dnl use latin 1 for now; the utf-8 handling in funcs.c uses assert(),
     dnl which is a bit silly and something we want to avoid
-    SQLITE_ENCODING="ISO8859"
-    dnl SQLITE_ENCODING="UTF-8"
-    dnl AC_DEFINE(SQLITE_UTF8,1,[if SQLite should use utf-8 encoding])
+    if test "$PHP_SQLITE_UTF8" = "yes"; then
+       SQLITE_ENCODING="UTF-8"
+       AC_DEFINE(SQLITE_UTF8, 1, [ ])
+    else
+       SQLITE_ENCODING="ISO8859"
+    fi
     PHP_SUBST(SQLITE_ENCODING)
 
     AC_PATH_PROG(LEMON,lemon,no)